Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-11-15 07:21:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,256 Commits 142 Branches 0 Tags 2.3 MiB
36a9a877e9
Commit Graph

1256 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Emmerich
396d5fe4f8 Changed Windows Subsystem for Linux's PWD to be the physical path rather than relative since windows cannot traverse a relative path inside the Linux subsystem. 2018-01-29 18:20:10 +02:00
Matt McCormick
26e90b4590 browser-asmjs: Use emscripten-slim to save image space 2018-01-29 01:15:20 -05:00
Matt McCormick
373402afbd browser-asmjs: Bump Emscripten to 1.37.29 2018-01-28 17:23:26 -05:00
Matt McCormick
3149fa69b5
Merge pull request #185 from thewtex/readme-64bit 
readme: Note that only 64-bit images are provided
 2018-01-22 17:46:27 -05:00
Matt McCormick
135f1f5f73 readme: Note that only 64-bit images are provided 2018-01-21 21:18:41 -05:00
Matt McCormick
fab99c574e
Merge pull request #183 from thewtex/emscripten 
browser-asmjs: Bump Emscripten version and address cache permissions
 2018-01-18 16:11:45 -05:00
Matt McCormick
c5fd5dc574 browser-asmjs: Bump Emscripten version and address cache permissions 
Addresses:

  WARNING:root:emcc: cannot find library "rt"
  INFO:root:generating system library: dlmalloc_debug.bc... (this will be cached in "/emsdk_portable/.cache/asmjs/dlmalloc_debug.bc" for subsequent builds)
  Traceback (most recent call last):
    File "/emsdk_portable/sdk/em++", line 16, in <module>
      emcc.run()
    File "/emsdk_portable/sdk/emcc.py", line 1411, in run
      extra_files_to_link += system_libs.calculate([f for _, f in sorted(temp_files)] + extra_files_to_link, in_temp, stdout_=None, stderr_=None, forced=forced_stdlibs)
    File "/emsdk_portable/sdk/tools/system_libs.py", line 485, in calculate
      libfile = shared.Cache.get(name, do_create, extension=suffix)
    File "/emsdk_portable/sdk/tools/cache.py", line 102, in get
      shutil.copyfile(temp, cachename)
    File "/usr/lib/python2.7/shutil.py", line 83, in copyfile
      with open(dst, 'wb') as fdst:
  IOError: [Errno 13] Permission denied: '/emsdk_portable/.cache/asmjs/dlmalloc_debug.bc'

when performing a Debug build.
 2018-01-18 11:27:08 -05:00
Matt McCormick
bc4b9cce7c
Merge pull request #178 from Korijn/patch-1 
bump cmake to v3.10.1
 2017-12-23 19:22:24 -05:00
Korijn van Golen
6f299349dd
bump cmake to v3.10.1 2017-12-21 08:52:51 +01:00
Matt McCormick
5f1de3ba03
Merge pull request #173 from guymguym/patch-1 
Missing shift in dockcross -- command [args]
 2017-10-29 15:10:09 -05:00
Guy Margalit
4606b71e68 Missing shift in dockcross -- command [args] 
Otherwise `--` is sent as the command...
 2017-10-26 15:26:04 +03:00
Matt McCormick
80ccc26e32 Merge pull request #172 from thewtex/mxe-bump 
windows-{x64,x86}: Bump MXE to 2017-10-25 master
 2017-10-25 12:14:58 -05:00
Matt McCormick
07e5aecff3 windows-{x64,x86}: Bump MXE to 2017-10-25 master 
MXE now ships its own version of CMake that sources the toolchain file,
etc. As suggested by their warning when sourcing the toolchain file, use
it.

This also results in updating GCC from 4.9 to 5.4.
 2017-10-25 12:14:50 -04:00
Matt McCormick
6a15a7aa24 Merge pull request #168 from thewtex/linux-arm64-cpp 
linux-arm64: Fix CPP path
 2017-10-10 14:14:27 -04:00
Matt McCormick
1f953ac197 Merge pull request #167 from thewtex/anchors-aliases 
circleci: Use anchors and aliases for build settings
 2017-10-10 14:14:13 -04:00
Matt McCormick
7414eacff0 linux-arm64: Fix CPP path 
Addresses #166
 2017-10-09 23:28:23 -04:00
Matt McCormick
3ed3a821b7 circleci: Use anchors and aliases for build settings 
Addresses #164
 2017-10-09 23:24:43 -04:00
Matt McCormick
3eed5ad215 Merge pull request #162 from john-yan/master 
Add linux-s390x support
 2017-09-16 11:05:50 -04:00