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

release: fix the docker phase #6175

Merged
merged 1 commit into from
Aug 22, 2024
Merged

release: fix the docker phase #6175

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
2 changes: 1 addition & 1 deletion master_changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
13 changes: 7 additions & 6 deletions release/Dockerfile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading