From: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
To: igt-dev@lists.freedesktop.org, Simon Ser <simon.ser@intel.com>
Subject: Re: [igt-dev] [PATCH i-g-t 1/8] Dockerfile: Avoid messing with WORKDIR
Date: Tue, 3 Sep 2019 14:06:42 +0300 [thread overview]
Message-ID: <20190903110615.nfgpmldv6b4payir@ahiler-desk1.fi.intel.com> (raw)
In-Reply-To: <20190903093510.GF4019@platvala-desk.ger.corp.intel.com>
On Tue, Sep 03, 2019 at 12:35:10PM +0300, Petri Latvala wrote:
> On Tue, Sep 03, 2019 at 11:36:07AM +0300, Arkadiusz Hiler wrote:
> > Just to reset it soon after. Let's just `cd` for each command.
> >
> > Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
> > ---
> > Dockerfile.build-fedora | 14 +++++---------
> > 1 file changed, 5 insertions(+), 9 deletions(-)
> >
> > diff --git a/Dockerfile.build-fedora b/Dockerfile.build-fedora
> > index 4ccaadd1..31056a2a 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 cd /tmp/peg && curl -O 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 cd /tmp/peg/peg-0.1.18 && make PREFIX=/usr install
>
> 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 cd /usr/src && curl -O https://files.pythonhosted.org/packages/c0/9b/44cdb8adcbb186be6cba5c93718d0c68f177b0e8082ae00cafa63a1d3535/meson-0.47.0.tar.gz
>
> Removing the useless-use-of-cd in this curl invocation:
>
> curl -o "/usr/src/#1" "https://files.pythonhosted.org/packages/c0/9b/44cdb8adcbb186be6cba5c93718d0c68f177b0e8082ae00cafa63a1d3535/{meson-0.47.0.tar.gz}"
>
>
> Similar trick can be applied to the above curl line.
I am not sure that this curl invocation is that much better than a
simple `cd`, but ok:
https://gitlab.freedesktop.org/ivyl/igt/commit/e31bd8a518458a15c121a33bd7c72ef0b09e5251
And here's the pipeline:
https://gitlab.freedesktop.org/ivyl/igt/pipelines/60764
To save some real-hardware CI time I'll just keep the updates on gitlab,
it does not affect anything else anyway.
--
Cheers,
Arek
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2019-09-03 11:06 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-03 8:36 [igt-dev] [PATCH i-g-t 1/8] Dockerfile: Avoid messing with WORKDIR Arkadiusz Hiler
2019-09-03 8:36 ` [igt-dev] [PATCH i-g-t 2/8] Dockerfile: Make sure that we use correct base image Arkadiusz Hiler
2019-09-03 8:36 ` [igt-dev] [PATCH i-g-t 3/8] .gitlab-ci: Remove dead code Arkadiusz Hiler
2019-09-03 8:36 ` [igt-dev] [PATCH i-g-t 4/8] .gitalb-ci: Use only the necessary tags Arkadiusz Hiler
2019-09-03 8:36 ` [igt-dev] [PATCH i-g-t 5/8] .gitlab-ci: Switch to podman/buildah/skopeo Arkadiusz Hiler
2019-09-03 8:37 ` [igt-dev] [PATCH i-g-t 6/8] Dockerfile: Clean package manager caches and squash images Arkadiusz Hiler
2019-09-03 8:38 ` [igt-dev] [PATCH i-g-t 7/8] .gitlab-ci: Don't pull images until they are needed Arkadiusz Hiler
2019-09-03 8:38 ` [igt-dev] [PATCH i-g-t 8/8] .gitlab-ci: Use true --prefix Arkadiusz Hiler
2019-09-03 9:10 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/8] Dockerfile: Avoid messing with WORKDIR Patchwork
2019-09-03 9:35 ` [igt-dev] [PATCH i-g-t 1/8] " Petri Latvala
2019-09-03 11:06 ` Arkadiusz Hiler [this message]
2019-09-03 11:41 ` [igt-dev] ✗ Fi.CI.IGT: failure for series starting with [i-g-t,1/8] " Patchwork
2019-09-03 12:46 ` Arkadiusz Hiler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190903110615.nfgpmldv6b4payir@ahiler-desk1.fi.intel.com \
--to=arkadiusz.hiler@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=simon.ser@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox