public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/rust/master] docker: Fix GCCRS_BUILD info
@ 2022-06-09 6:17 Thomas Schwinge
0 siblings, 0 replies; only message in thread
From: Thomas Schwinge @ 2022-06-09 6:17 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:ab0f9f9e1b9e55522e649d58520fdedcdb6c8859
commit ab0f9f9e1b9e55522e649d58520fdedcdb6c8859
Author: Arthur Cohen <arthur.cohen@embecosm.com>
Date: Wed Jun 8 10:57:16 2022 +0200
docker: Fix GCCRS_BUILD info
Sometimes, the GCCRS_BUILD file would end up empty. I believe this is
due to how Dockerfiles work in that there was a "race condition" between
the two `RUN` commands. Hopefully this should fix it.
Diff:
---
Dockerfile | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index da97edacb9e..759b934fc42 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,6 +50,7 @@ RUN apt-get update; \
ADD . /usr/src/gcc
RUN /bin/sh -c set -ex; \
cd /usr/src/gcc; \
+ git log -1 --format="%h" > /GCCRS_BUILD; \
./contrib/download_prerequisites; { rm *.tar.* || true; }; \
mkdir -p /usr/src/gcc/gcc-build; \
cd /usr/src/gcc/gcc-build; \
@@ -59,9 +60,6 @@ RUN /bin/sh -c set -ex; \
cd /root; \
rm -rf /usr/src/gcc
-RUN cd /usr/src/gcc; \
- git log -1 --format="%h" > /GCCRS_BUILD; \
-
RUN /bin/sh -c set -ex; \
echo '/usr/local/lib64' > /etc/ld.so.conf.d/local-lib64.conf; \
ldconfig -v
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-06-09 6:17 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-09 6:17 [gcc/devel/rust/master] docker: Fix GCCRS_BUILD info Thomas Schwinge
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).