Commit Graph

874 Commits

Author SHA1 Message Date
Nadav Ruskin
47b473054a Added forgotten PKG_CONFIG_PATH 2018-04-25 05:56:18 -04:00
Nadav Ruskin
88c828b855 Trying to integrate my linux-arm64 solution to dockcross 2018-04-25 05:50:45 -04:00
Nadav
e2c5545bf6
Merge pull request #1 from dockcross/master
merge
2018-04-25 12:35:45 +03:00
Matt McCormick
97fdb764c7
Merge pull request #220 from thewtex/emscripten-1.37.37
browser-asmjs: Bump Emscripten to 1.37.37
2018-04-24 00:08:38 -04:00
Matt McCormick
407ead371c browser-asmjs: Bump Emscripten to 1.37.37 2018-04-23 22:25:12 -04:00
Matt McCormick
41e4949396
Merge pull request #219 from thewtex/readme-order
README: Improve section order
2018-04-16 22:33:42 -04:00
Matt McCormick
fcfa9b6060 README: Improve section order
New users should see the most relevant sections first. In particular,

- Examples
- Installation
- Usage
2018-04-16 15:45:39 -04:00
Matt McCormick
7164a97f7e
Merge pull request #218 from thewtex/disable-broken-deploys
crossbuild-essential images: disable deploy
2018-04-16 07:46:44 -04:00
Matt McCormick
9f0468a72f crossbuild-essential images: disable deploy
This is a follow-up to 57bf16fa17
2018-04-15 22:54:04 -04:00
Matt McCormick
49a15ac3e1
Merge pull request #217 from fbudin69500/UpdateGit
Update git
2018-04-15 22:51:30 -04:00
Francois Budin
602fb22cce ENH: Compile git with SSL support
Older versions of git included in older linux distributions are not able
to download source from Github. A newer version is required with a newer
OpenSSL. This requires to also build curl with the same OpenSSL.

CMake is downloaded precompiled if available (64bits system) or compiled
from source otherwise.
2018-04-14 19:12:07 -04:00
Francois Budin
856ef6016e BUG: Remove cpack symbolic link before creating the new link 2018-04-13 15:01:54 -04:00
Jean-Christophe Fillion-Robin
53d98cf4ff Fix download of files using up-to-date "curl" instead of "wget"
In few images, curl is only tool that able to download from https
source requiring TLS 1.2
2018-04-13 15:01:54 -04:00
Matt McCormick
53990df0b8
Merge pull request #215 from thewtex/disable-embedian
crossbuild-essential images: disable because of missing packages
2018-04-03 09:35:18 -04:00
Matt McCormick
57bf16fa17 crossbuild-essential images: disable because of missing packages
Temporarily disable because the packages are not available. See #209.

These should be replaced by crosstool-ng images.
2018-04-02 15:58:58 -04:00
Matt McCormick
f0986b663b
Merge pull request #201 from Nadav-Eyesight/android_arm64
Add Android-arm64
2018-04-02 14:55:49 -04:00
Matt McCormick
f403246365
Merge pull request #200 from Nadav-Eyesight/android_more_variables
Android - Use clang and add an API variable
2018-04-02 14:32:01 -04:00
Jean-Christophe Fillion-Robin
0992f871d6
Merge pull request #214 from dockcross/fix-name-of-image-in-dockcross-helptext-2
entrypoint.sh: Account for image tag when updating help text
2018-03-29 21:05:55 -04:00
Jean-Christophe Fillion-Robin
7b76882b56
entrypoint.sh: Account for image tag when updating help text
This commit is a follow up of b7028af (entrypoint.sh: Update help
text so that current image name is used)

It ensures that the suggested script in the help text doesn't include ":"
in its name.

Assuming DEFAULT_DOCKCROSS_IMAGE is set to "dockcross/imagename:latest"

Instead of suggesting:

  [...]
  # docker run --rm dockcross/imagename:latest > dockcross-imagename:latest
  # chmod +x dockcross-imagename:latest
  [...]

it will now suggest

  [...]
  # docker run --rm dockcross/imagename:latest > dockcross-imagename-latest
  # chmod +x dockcross-imagename-latest
  [...]

xref https://github.com/dockbuild/dockbuild/issues/30

[ci skip]
2018-03-29 21:04:52 -04:00
Jean-Christophe Fillion-Robin
902677437f
Merge pull request #213 from dockcross/README-fix-arcticle-link
README: Fix Articles link

[ci skip]
2018-03-29 18:28:15 -04:00
Jean-Christophe Fillion-Robin
f64ed37abb
README: Fix Articles link
Fixes #211

[ci skip]
2018-03-29 18:27:32 -04:00
Jean-Christophe Fillion-Robin
9966e1aed7
Merge pull request #207 from dockcross/fix-name-of-image-in-dockcross-helptext
entrypoint.sh: Update help text so that current image name is used
2018-03-29 15:09:00 -04:00
Jean-Christophe Fillion-Robin
b7028af76e
entrypoint.sh: Update help text so that current image name is used
xref https://github.com/dockbuild/dockbuild/issues/30
2018-03-29 04:43:26 -04:00
Nadav
f8e034ee01
Update Dockerfile 2018-03-28 11:43:22 +03:00
Nadav Ruskin
a39041bf0d Changed CC and CXX variables 2018-03-28 04:42:48 -04:00
Nadav
a38741b30f
Fixed bracket typo 2018-03-27 17:48:27 +03:00
Matt McCormick
bad2204ccc
Merge pull request #204 from dockcross/explain-difference-dockcross-dockbuild
README: Explain difference between dockcross and dockbuild
2018-03-19 16:51:10 -04:00
Jean-Christophe Fillion-Robin
b809eaade6
README: Explain difference between dockcross and dockbuild
[ci skip]
2018-03-19 16:23:22 -04:00
Matt McCormick
b5d4166799
Merge pull request #205 from dockcross/update-license
Update LICENSE copyright dates and add @jcfr
2018-03-19 16:08:07 -04:00
Jean-Christophe Fillion-Robin
f14bfaa6e5
Update LICENSE copyright dates and add @jcfr
[ci skip]
2018-03-19 15:50:28 -04:00
Nadav
71d47e6888
Minor fix 2018-03-19 14:57:40 +02:00
Nadav
3c4049d504
Added android-arm64 2018-03-19 14:57:00 +02:00
Nadav
bf71007be4
Added android-arm64 as a target 2018-03-19 14:55:14 +02:00
Nadav
1cad97f9b2
Adding android-arm64 as a target 2018-03-19 14:50:17 +02:00
Nadav
71dfbcc509
Update Dockerfile 2018-03-18 11:10:47 +02:00
Nadav
d8adcfc2f4
Update Dockerfile 2018-03-18 11:08:14 +02:00
Nadav
496c4a2597
Add arm64 packages by default 2018-03-15 14:37:54 +02:00
Nadav
8efd22e3df
Updated API defaults to suit minimum arm64 2018-03-15 13:51:50 +02:00
Nadav
9b5f381b72
Fixed cross triple 2018-03-15 12:38:23 +02:00
Nadav
f7b5a29b3d
Update Dockerfile
Changed `androideabi` to `android`
2018-03-15 12:37:39 +02:00
Nadav
e362e021de
Update Dockerfile 2018-03-15 10:27:46 +02:00
Nadav.Ruskin
f94d4a853f Added android arm 64 2018-03-15 08:56:21 +01:00
Nadav.Ruskin
f8cabb2edb Added ANDROID_NDK_API 2018-03-15 08:46:43 +01:00
Nadav.Ruskin
6fb4121ea9 Android: Use clang 2018-03-15 08:36:06 +01:00
Jean-Christophe Fillion-Robin
3a403bfc8f
Merge pull request #196 from Nadav-Eyesight/master
Updated readme to include instructions on extending images.
2018-03-13 03:36:25 -04:00
Nadav.Ruskin
5e7bd3add1 Updated readme to include instructions on extending images. 2018-03-11 16:21:24 +01:00
Matt McCormick
966365e21c
Merge pull request #191 from asRIA/patch-1
Remove duplicated code from base image.
2018-02-13 20:28:49 -05:00
trzeci
f0a1a63418 Remove duplicated code from base image
asRIA/emscripten-docker#16 creates $EM_DATA with cache and 777 permissions.
* Paths to folders: 79343484f3/docker/trzeci/emscripten-slim/Dockerfile (L13-L16)
* Change permission: 79343484f3/docker/trzeci/emscripten-slim/Dockerfile (L183)
2018-02-08 23:09:38 +01:00
Matt McCormick
744f178267
Merge pull request #189 from EatonEmmerich/master
QuickFix for issue #186
2018-01-29 13:53:30 -05:00
Matt McCormick
dedadc6d47
Merge pull request #188 from thewtex/emscripten-1.37.29
Emscripten 1.37.29
2018-01-29 13:20:53 -05:00