Commit Graph

24 Commits

Author SHA1 Message Date
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
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
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
7451c09bcf browser-asmjs: Bump Emscripten to 1.37.21 2017-09-14 11:44:44 -04:00
Roman Valls Guimera
4281676888 Removing code that the base image is doing, thanks @thewtex 2017-02-28 19:05:47 +01:00
Roman Valls Guimera
7dbbf54834 Docker ENV bump as well 2017-02-24 03:20:45 +01:00
Roman Valls Guimera
a4e1032da9 Bump up emscripten docker container so that it supports WebAssembly, thanks @asRIA. 2017-02-23 18:58:03 +01:00
Jean-Christophe Fillion-Robin
09868d5289
browser-asmjs: Update to depend on existing image from "trzeci/emscripten"
This commit updates the "browser-asmjs" images to avoid systematic
rebuild of emscripten sdk. Instead, it introduces dependency on the
image maintained by @trzeci

Note also:

* emscripten sdk updated from 1.36.7 to 1.36.14

* symlinking of "/bin/bash" as "/bin/sh" is reverted. This ensures other
  images including file like "common.debian" and relying on standard "sh"
  behavior will work as expected.

* workaround associated with CMakeForceCompiler has been removed from
  Dockerfile. Emscripten as been fixed.
  See https://github.com/kripken/emscripten/pull/4477

* we will revisit once official images are available.
  See https://github.com/kripken/emscripten/issues/4682
2016-11-25 15:51:42 -05:00
Jean-Christophe Fillion-Robin
cfcc7d6700
dockerfile: Keep track of buildtime metadata
This commit build each images with the following arguments:

* IMAGE: Name of the image (e.g dockcross/base, dockcross/manylinux-x64, ...)
* VCS_REF: dockcross/dockcross commit from which this image is built
* VCS_URL: this repository obtained reading remote.origin.url
* BUILD_DATE: Date and time when the build was initiated

Then, within the Dockerfile, the metadata are associated with the image
using the "LABEL" instruction.
See https://docs.docker.com/engine/reference/builder/#/label

The corresponding labels can be found here:
http://label-schema.org/rc1/#build-time-labels

See #28
2016-10-30 23:57:04 -04:00
Matt McCormick
b72060d9a2 browser-asmjs: Remove CMakeForceCompiler
CMakeForceCompiler was marked deprecated in CMake 3.6.0. It emits many
warnings when using Emscripten. These changes can be removed in a future
version of Emscripten when it is disabled or removed per:
https://github.com/kripken/emscripten/pull/4477
2016-08-11 11:51:42 -04:00
Matt McCormick
70da314cf0 browser-asmjs: Bump Emscripten to 1.36.7 2016-08-11 11:45:23 -04:00
Matt McCormick
04c7d0de18 Rename project and repository to dockcross 2016-07-15 23:46:08 -04:00
Matt McCormick
30e29f3bbb browser-asmjs: cp ~/.emscripten, etc to the user home in the entrypoint 2016-07-06 15:33:35 -04:00
Matt McCormick
b84b303f13 browser-asmjs: Use updated Node Debian package sources 2016-07-05 22:24:59 -04:00
Matt McCormick
2c01672248 browser-asmjs: Bump Emscripten to 1.36.5 2016-07-05 22:12:33 -04:00
Matt McCormick
fdb18671e3 dockcross: make the default image specific to each compiler 2016-07-04 00:10:36 -04:00
Matt McCormick
f647f8991b browser-asmjs: Update Emscripten to 1.36.1.
Only a 32-bit sdk tag is available from emsdk.
2016-03-12 21:25:44 -05:00
Matt McCormick
7225ca1c70 browser-asmjs: --no-install-recommends dependent packages. 2016-03-09 18:28:54 -05:00
Matt McCormick
4b5cb749a8 Bump emscripten version to 1.35.4. 2015-10-30 20:08:09 -04:00
Matt McCormick
a0eb491f81 browser-asmjs: Update CMake toolchain file for tagged version. 2015-07-24 16:06:40 -04:00
Matt McCormick
11ade45f52 browser-asmjs: Bump emscripten to 1.34.3. 2015-07-23 00:08:56 -04:00
Matt McCormick
539fee51a9 browser-asmjs: Update to Emscripten to 1.33.0. 2015-05-30 07:00:32 -04:00
Matt McCormick
6e545319f0 browser-asmjs: Rename from javascript-asmjs.
We are one past the 30-character limit at DockerHub otherwise :-(.
2015-05-19 17:52:43 -04:00