Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2.1 backport] release: fix the docker phase #6177

Merged
merged 1 commit into from
Aug 22, 2024
Merged

[2.1 backport] release: fix the docker phase #6177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions master_changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*

Expand Down
15 changes: 8 additions & 7 deletions release/Dockerfile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading