Skip to content

Commit b03afad

Browse files
authored
Merge pull request #6176 from kit-ty-kate/fix-release-2.2
[2.2 backport] release: fix the docker phase
2 parents 7b95e1f + 34fb54e commit b03afad

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

master_changes.md

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ users)
7171
## Infrastructure
7272

7373
## Release scripts
74+
* Fix the binaries built by docker as the result of the configure script was prepended [#6175 @kit-ty-kate - fix #6174]
7475

7576
## Install script
7677

release/Dockerfile.in

+7-6
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@ RUN apk add patch
2323
ENV PATH /usr/local/bin:/usr/bin:/bin
2424
USER opam
2525
WORKDIR /home/opam/
26-
CMD tar xz >&2 && \
27-
cd opam-full-${VERSION} >&2 && \
28-
./configure --with-vendored-deps --with-mccs && \
29-
echo "(${LINKING})" > src/client/linking.sexp && \
30-
make opam >&2 && \
31-
strip opam >&2 && \
26+
CMD { tar xz && \
27+
cd opam-full-${VERSION} && \
28+
./configure --with-vendored-deps --with-mccs && \
29+
echo "(${LINKING})" > src/client/linking.sexp && \
30+
make opam && \
31+
strip opam ; \
32+
} >&2 && \
3233
cat opam

0 commit comments

Comments
 (0)