Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1427336 - Share dot-config between docker-images. r=dustin

Browse Source 
--HG--
rename : taskcluster/docker/android-build/dot-config/pip/pip.conf => taskcluster/docker/recipes/dot-config/pip/pip.conf
extra : rebase_source : 1c2ec206f1560509f0db296da4d7be22811441ac
This commit is contained in:
Mike Hommey 2017-12-29 14:48:23 +09:00
parent 9caadb59e2
commit 934ddc3e58
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
taskcluster/docker/android-build/Dockerfile
View File

@ -103,7 +103,8 @@ COPY topsrcdir/taskcluster/docker/recipes/xvfb.sh /builds/worker/scripts/xvfb.sh
COPY topsrcdir/taskcluster/docker/recipes/run-task /builds/worker/bin/run-task
# Add pip configuration, among other things.
COPY dot-config /builds/worker/.config
# %include taskcluster/docker/recipes/dot-config
COPY topsrcdir/taskcluster/docker/recipes/dot-config /builds/worker/.config
# Stubbed out credentials; mozharness looks for this file an issues a WARNING
# if it's not found, which causes the build to fail. Note that this needs to

3
taskcluster/docker/desktop-build/Dockerfile
View File

@ -47,7 +47,8 @@ ADD topsrcdir/taskcluster/docker/recipes/xvfb.sh /builds/worker/scripts/xvfb.sh
ADD topsrcdir/taskcluster/docker/recipes/run-task /builds/worker/bin/run-task
# Add configuration
COPY dot-config /builds/worker/.config
# %include taskcluster/docker/recipes/dot-config
COPY topsrcdir/taskcluster/docker/recipes/dot-config /builds/worker/.config
# Generate machine uuid file
RUN dbus-uuidgen --ensure=/var/lib/dbus/machine-id

2
taskcluster/docker/desktop-build/dot-config/pip/pip.conf
View File

@ -1,2 +0,0 @@
[global]
disable-pip-version-check = true

0
taskcluster/docker/android-build/dot-config/pip/pip.conf → taskcluster/docker/recipes/dot-config/pip/pip.conf
View File

4
taskcluster/docker/valgrind-build/Dockerfile
View File

@ -47,8 +47,8 @@ ADD topsrcdir/taskcluster/docker/recipes/xvfb.sh /builds/worker/scripts/xvfb.sh
ADD topsrcdir/taskcluster/docker/recipes/run-task /builds/worker/bin/run-task
# Add configuration
# %include taskcluster/docker/desktop-build/dot-config
ADD topsrcdir/taskcluster/docker/desktop-build/dot-config /builds/worker/.config
# %include taskcluster/docker/recipes/dot-config
ADD topsrcdir/taskcluster/docker/recipes/dot-config /builds/worker/.config
# Generate machine uuid file
RUN dbus-uuidgen --ensure=/var/lib/dbus/machine-id