diff --git a/master_changes.md b/master_changes.md index 1ab70ae3e4a..548c3eb5db8 100644 --- a/master_changes.md +++ b/master_changes.md @@ -71,6 +71,7 @@ users) ## Infrastructure ## Release scripts + * Fix the binaries built by docker as the result of the configure script was prepended [#6175 @kit-ty-kate - fix #6174] ## Install script diff --git a/release/Dockerfile.in b/release/Dockerfile.in index eb2b55daf3f..77ce913a8c9 100644 --- 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