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

Jump to bottom

bump opam to 2.1 #17

Merged
merged 2 commits into from
Mar 31, 2022
Merged

bump opam to 2.1 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43b97bc
Update images.yml
gares Mar 29, 2022
930e5b1
fix: Use pre-prod URL https://opam-3.ocaml.org/opam-dev-pubkey.pgp
erikmd Mar 31, 2022
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 base/bare/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ RUN cat /proc/cpuinfo /proc/meminfo \
&& set -x \
&& curl -fSL -o "/tmp/${binary}" "https://github.com/ocaml/opam/releases/download/${OPAM_VERSION}/${binary}" \
&& curl -fSL -o "/tmp/${binary}.sig" "https://github.com/ocaml/opam/releases/download/${OPAM_VERSION}/${binary}.sig" \
&& curl -fsSL https://opam.ocaml.org/opam-dev-pubkey.pgp | gpg --batch --import \
&& curl -fsSL https://opam-3.ocaml.org/opam-dev-pubkey.pgp | gpg --batch --import \
&& gpg --batch --verify "/tmp/${binary}.sig" "/tmp/${binary}" \
&& mv "/tmp/${binary}" /usr/local/bin/opam \
&& chmod a+x /usr/local/bin/opam \
Expand Down
2 changes: 1 addition & 1 deletion base/dual/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ RUN cat /proc/cpuinfo /proc/meminfo \
&& set -x \
&& curl -fSL -o "/tmp/${binary}" "https://github.com/ocaml/opam/releases/download/${OPAM_VERSION}/${binary}" \
&& curl -fSL -o "/tmp/${binary}.sig" "https://github.com/ocaml/opam/releases/download/${OPAM_VERSION}/${binary}.sig" \
&& curl -fsSL https://opam.ocaml.org/opam-dev-pubkey.pgp | gpg --batch --import \
&& curl -fsSL https://opam-3.ocaml.org/opam-dev-pubkey.pgp | gpg --batch --import \
&& gpg --batch --verify "/tmp/${binary}.sig" "/tmp/${binary}" \
&& mv "/tmp/${binary}" /usr/local/bin/opam \
&& chmod a+x /usr/local/bin/opam \
Expand Down
2 changes: 1 addition & 1 deletion base/single/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ RUN cat /proc/cpuinfo /proc/meminfo \
&& set -x \
&& curl -fSL -o "/tmp/${binary}" "https://github.com/ocaml/opam/releases/download/${OPAM_VERSION}/${binary}" \
&& curl -fSL -o "/tmp/${binary}.sig" "https://github.com/ocaml/opam/releases/download/${OPAM_VERSION}/${binary}.sig" \
&& curl -fsSL https://opam.ocaml.org/opam-dev-pubkey.pgp | gpg --batch --import \
&& curl -fsSL https://opam-3.ocaml.org/opam-dev-pubkey.pgp | gpg --batch --import \
&& gpg --batch --verify "/tmp/${binary}.sig" "/tmp/${binary}" \
&& mv "/tmp/${binary}" /usr/local/bin/opam \
&& chmod a+x /usr/local/bin/opam \
Expand Down
2 changes: 1 addition & 1 deletion images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ base_url: 'https://gitlab.com/coq-community/docker-base'
active: true
docker_repo: 'coqorg/base'
args:
OPAM_VERSION: '2.0.9'
OPAM_VERSION: '2.1.2'
# pass these args albeit they are not used by all Dockerfiles:
OCAMLFIND_VERSION: '1.9.1'
DUNE_VERSION: '2.9.1'
Expand Down