Commit Graph

440 Commits

Author SHA1 Message Date
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
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
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
Junliang Yan
adbedc79d6 Address comments in linux-s390/Dockerfile.in 2017-09-15 14:03:08 -04:00
Junliang Yan
ceacbcc1a1 Add s390x to README.rst 2017-09-15 13:58:07 -04:00
Junliang Yan
6135a6b8ac Add linux-s390x to config.yml 2017-09-15 13:54:22 -04:00
Matt McCormick
a7fe377eac Merge pull request #161 from thewtex/emscripten-bump
browser-asmjs: Bump Emscripten to 1.37.21
2017-09-14 18:20:40 -04:00
Junliang Yan
8b78b8d2d7 Add linux-s390x support 2017-09-14 16:59:57 -04:00
Matt McCormick
7451c09bcf browser-asmjs: Bump Emscripten to 1.37.21 2017-09-14 11:44:44 -04:00
Matt McCormick
ef5f9b1c68 Merge pull request #155 from danjacques/linux-mips
Implement "ct-ng" building, add "linux-mips".
2017-09-05 00:31:34 -04:00
Matt McCormick
2d0e17f48a linux-mips: add to README 2017-09-05 00:17:04 -04:00
Dan Jacques
7dd46fa045 Implement "ct-ng" building, add "linux-mips".
Add a mechanism to construct a full cross-compiler environment using the
"crosstool-ng" cross-compiler building utility. This is implemented in
the new "common.crosstool" include, and augments the "dockcross/base"
base image.

Update Makefile to consolidate Dockerfile generation, notably the
"sed"-based inclusion directives.

Finally, employ all of this to generate a "linux-mips" 32-bit hard-float
MIPS cross-compiler Dockcross image.
2017-09-01 10:09:31 -04:00
Matt McCormick
fd4115953d Merge pull request #157 from thewtex/circleci-2
ci: Use CircleCI 2.0
2017-08-28 15:15:01 -04:00
Matt McCormick
499f8f5510 ci: Use CircleCI 2.0
Addresses #156
2017-08-28 13:24:53 -04:00
Matt McCormick
da5aebb14f Merge pull request #153 from conz27/fix_home_dir_ownership
Fix $HOME directory ownership permissions
2017-06-29 11:20:37 -07:00
Constantine Grantcharov
b1cef063a1 Fix $HOME directory ownership permissions
BUG:

Creating a new directory under /home/<user>/ from the /work folder does
not work. In fact, going into the home directory and trying to run mkdir
fails as well.

SOLUTION:

Turns out chown -R <user>:<user> was run on $HOME/* instead of on $HOME.
This means that /home/<user> was still under the ownership of root:root,
hence preventing any writes to non-root users.
2017-06-29 08:31:33 -04:00
Matt McCormick
2b28515daf Merge pull request #151 from jam7/fix-pip
linux-*: Change common.docker to fix pip installation.
2017-06-10 18:07:17 -07:00
Matt McCormick
7dd41cdc4b common: work around overlay storage backend pip uninstall
Addresses:

  Collecting pip
  Downloading pip-9.0.1-py2.py3-none-any.whl (1.3MB)
Collecting wheel
  Downloading wheel-0.29.0-py2.py3-none-any.whl (66kB)
Installing collected packages: pip, wheel
  Found existing installation: pip 1.5.6
    Uninstalling pip-1.5.6:
Exception:
Traceback (most recent call last):
  File "/tmp/tmpqu31Wp/pip.zip/pip/basecommand.py", line 215, in main
    status = self.run(options, args)
  File "/tmp/tmpqu31Wp/pip.zip/pip/commands/install.py", line 342, in run
    prefix=options.prefix_path,
  File "/tmp/tmpqu31Wp/pip.zip/pip/req/req_set.py", line 778, in install
    requirement.uninstall(auto_confirm=True)
  File "/tmp/tmpqu31Wp/pip.zip/pip/req/req_install.py", line 754, in uninstall
    paths_to_remove.remove(auto_confirm)
  File "/tmp/tmpqu31Wp/pip.zip/pip/req/req_uninstall.py", line 115, in remove
    renames(path, new_path)
  File "/tmp/tmpqu31Wp/pip.zip/pip/utils/__init__.py", line 267, in renames
    shutil.move(old, new)
  File "/usr/lib/python2.7/shutil.py", line 300, in move
    rmtree(src)
  File "/usr/lib/python2.7/shutil.py", line 247, in rmtree
    rmtree(fullname, ignore_errors, onerror)
  File "/usr/lib/python2.7/shutil.py", line 256, in rmtree
    onerror(os.rmdir, path, sys.exc_info())
  File "/usr/lib/python2.7/shutil.py", line 254, in rmtree
    os.rmdir(path)
  OSError: [Errno 39] Directory not empty: '/usr/lib/python2.7/dist-packages/pip/backwardcompat'

when Docker is using the overlay fs backend. See:

  https://github.com/moby/moby/issues/12327
2017-06-10 17:40:36 -04:00
Kazushi (Jam) Marukawa
e6b6ef9d68 Change common.docker to fix pip installation for linux-*.
This won't nothing for manylinux-* since pip is installed correctly by manylinux-common/install-python-packages.sh.
2017-06-09 23:21:26 +09:00