release: fix the docker phase

Would prepend the output of the configure script before
ocaml · Aug 22, 2024 · f6353c6 · f6353c6
1 parent dd1e344
commit f6353c6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/master_changes.md b/master_changes.md
@@ -111,7 +111,7 @@ users)
   * Ensure the configure file stays as it is in the tag, in the opam-full-<version>.tar.gz archive [#6066 @kit-ty-kate]
   * Exclude the .git directory from the release archive when using GNU tar [#6066 @kit-ty-kate]
   * Ensure non-existing %.cache target fail with a fatal error [#6066 @kit-ty-kate]
-  * Remove opam 2.1 support from the release script [#6084 @kit-ty-kate]
+  * Remove opam 2.1 support from the release script [#6084 #6175 @kit-ty-kate]
 
 ## Install script
   * Provide a shell/install.ps1 PowerShell script to install opam on Windows [#5906 @kit-ty-kate @dra27]

diff --git a/release/Dockerfile.in b/release/Dockerfile.in
@@ -23,10 +23,11 @@ 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-vendored-deps --with-mccs && \
-    echo "(${LINKING})" > src/client/linking.sexp && \
-    make opam >&2 && \
-    strip opam >&2 && \
+CMD { tar xz && \
+      cd opam-full-${VERSION} && \
+      ./configure --with-vendored-deps --with-mccs && \
+      echo "(${LINKING})" > src/client/linking.sexp && \
+      make opam && \
+      strip opam ; \
+    } >&2 && \
     cat opam