diff options
author | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2019-09-02 12:59:16 +0300 |
---|---|---|
committer | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2019-09-03 18:26:08 +0300 |
commit | 2a894cfeaefd359edc37182508cae2219612eabd (patch) | |
tree | 4c823b1989f97219768bf5e80377519209d40608 /Dockerfile.build-fedora | |
parent | 90babd3f12707dfabaa58bb18f6b8e22636b6895 (diff) |
Dockerfile: Avoid messing with WORKDIR
Just to reset it soon after. Let's just `cd` for each command.
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
Diffstat (limited to 'Dockerfile.build-fedora')
-rw-r--r-- | Dockerfile.build-fedora | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/Dockerfile.build-fedora b/Dockerfile.build-fedora index 4ccaadd1..1a19d587 100644 --- a/Dockerfile.build-fedora +++ b/Dockerfile.build-fedora @@ -27,11 +27,11 @@ RUN dnf install -y \ # We need peg to build overlay RUN dnf install -y make RUN mkdir /tmp/peg -WORKDIR /tmp/peg + # originaly from http://piumarta.com/software/peg/ -RUN curl -O https://intel-gfx-ci.01.org/mirror/peg/peg-0.1.18.tar.gz -RUN tar xf peg-0.1.18.tar.gz -RUN cd peg-0.1.18 && make PREFIX=/usr install +RUN curl -o "/tmp/peg/#1" "https://intel-gfx-ci.01.org/mirror/peg/{peg-0.1.18.tar.gz}" +RUN tar -C /tmp/peg -xf /tmp/peg/peg-0.1.18.tar.gz +RUN make -C /tmp/peg/peg-0.1.18 PREFIX=/usr install RUN rm -fr /tmp/peg # For compile-testing on clang @@ -41,8 +41,4 @@ RUN dnf install -y clang RUN dnf install -y findutils # Meson version switching shenanigans -WORKDIR /usr/src -RUN curl -O https://files.pythonhosted.org/packages/c0/9b/44cdb8adcbb186be6cba5c93718d0c68f177b0e8082ae00cafa63a1d3535/meson-0.47.0.tar.gz - -# Cleanup workdir -WORKDIR / +RUN curl -o "/usr/src/#1" "https://files.pythonhosted.org/packages/c0/9b/44cdb8adcbb186be6cba5c93718d0c68f177b0e8082ae00cafa63a1d3535/{meson-0.47.0.tar.gz}" |