diff --git a/master_changes.md b/master_changes.md index b1230e0321d..7c248b88e7b 100644 --- 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 index fa2bb877b6f..f587d5ed66b 100644 --- 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