Merge pull request #6177 from kit-ty-kate/fix-release-2.1

[2.1 backport] release: fix the docker phase
ocaml · Aug 22, 2024 · 2639212 · 2639212
2 parents 66f7251 + c4cfb34
commit 2639212
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/master_changes.md b/master_changes.md
@@ -63,6 +63,9 @@ New option/command/subcommand are prefixed with ◈.
 ## Infrastructure
   * Ensure the full archive includes the 0install sources [#5624 @dra27]
 
+## Release scripts
+  * Fix the binaries built by docker as the result of the configure script was prepended [#6175 @kit-ty-kate - fix #6174]
+
 ## Admin
   *
 

diff --git a/release/Dockerfile.in b/release/Dockerfile.in
@@ -23,11 +23,12 @@ RUN apk add patch
 ENV PATH /usr/local/bin:/usr/bin:/bin
 USER opam
 WORKDIR /home/opam/
-CMD tar xz >&2 && \
-    cd opam-full-${VERSION} >&2 && \
-    ./configure --with-mccs && \
-    make lib-ext && \
-    echo "(${LINKING})" > src/client/linking.sexp && \
-    make opam >&2 && \
-    strip opam >&2 && \
+CMD { tar xz && \
+      cd opam-full-${VERSION} && \
+      ./configure --with-mccs && \
+      make lib-ext && \
+      echo "(${LINKING})" > src/client/linking.sexp && \
+      make opam && \
+      strip opam ; \
+    } >&2 && \
     cat opam