From 06889a0ac63c27ae8eb9e6de82dca3ec0ac69922 Mon Sep 17 00:00:00 2001 From: "Brian J. Cardiff" Date: Mon, 20 Apr 2020 11:37:38 -0300 Subject: [PATCH 1/2] Perform bdwgc checkout with --force --- linux/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Dockerfile b/linux/Dockerfile index 2564724f..9f426c16 100644 --- a/linux/Dockerfile +++ b/linux/Dockerfile @@ -57,9 +57,9 @@ ARG gc_version ARG libatomic_ops_version RUN git clone https://github.com/ivmai/bdwgc \ && cd bdwgc \ - && git checkout ${gc_version} \ + && git checkout --force ${gc_version} \ && git clone https://github.com/ivmai/libatomic_ops \ - && (cd libatomic_ops && git checkout ${libatomic_ops_version}) \ + && (cd libatomic_ops && git checkout --force ${libatomic_ops_version}) \ \ && ./autogen.sh \ && ./configure --disable-debug --disable-shared --enable-large-config \ From 0983c335fa83a55b512257f9722ee7025df3d36e Mon Sep 17 00:00:00 2001 From: "Brian J. Cardiff" Date: Mon, 20 Apr 2020 12:13:33 -0300 Subject: [PATCH 2/2] Use git clone --branch for bdwgc --- linux/Dockerfile | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/linux/Dockerfile b/linux/Dockerfile index 9f426c16..c24ccb26 100644 --- a/linux/Dockerfile +++ b/linux/Dockerfile @@ -15,11 +15,9 @@ ENV CC="clang-8" ARG gc_version ARG libatomic_ops_version COPY files/feature-thread-stackbottom-upstream.patch /tmp/ -RUN git clone https://github.com/ivmai/bdwgc \ +RUN git clone https://github.com/ivmai/bdwgc --branch=${gc_version} \ && cd bdwgc \ - && git checkout ${gc_version} \ - && git clone https://github.com/ivmai/libatomic_ops \ - && (cd libatomic_ops && git checkout ${libatomic_ops_version}) \ + && git clone https://github.com/ivmai/libatomic_ops --branch=${libatomic_ops_version} \ \ && patch -p1 < /tmp/feature-thread-stackbottom-upstream.patch \ \ @@ -55,11 +53,9 @@ ENV CFLAGS="-fPIC -pipe ${release:+-O2}" # Build libgc (again, this time for musl) ARG gc_version ARG libatomic_ops_version -RUN git clone https://github.com/ivmai/bdwgc \ +RUN git clone https://github.com/ivmai/bdwgc --branch=${gc_version} \ && cd bdwgc \ - && git checkout --force ${gc_version} \ - && git clone https://github.com/ivmai/libatomic_ops \ - && (cd libatomic_ops && git checkout --force ${libatomic_ops_version}) \ + && git clone https://github.com/ivmai/libatomic_ops --branch=${libatomic_ops_version} \ \ && ./autogen.sh \ && ./configure --disable-debug --disable-shared --enable-large-config \