Skip to content

Commit

Permalink
use the production opam.ocaml.org URL to get PGP keys (#23)
Browse files Browse the repository at this point in the history
opam-3.ocaml.org was introduced as a temporary measure in
930e5b1 (#17), but that
server will decommissioned quite soon (ocaml/infrastructure#19)
so this will avoid build breakage for Coq.
  • Loading branch information
avsm authored Mar 14, 2023
1 parent 8f3102b commit 62f6891
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion base/bare/Dockerfile
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-3.ocaml.org/opam-dev-pubkey.pgp | gpg --batch --import \
&& curl -fsSL https://opam.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
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-3.ocaml.org/opam-dev-pubkey.pgp | gpg --batch --import \
&& curl -fsSL https://opam.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
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-3.ocaml.org/opam-dev-pubkey.pgp | gpg --batch --import \
&& curl -fsSL https://opam.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

0 comments on commit 62f6891

Please sign in to comment.