From 4eada030c09a766cbdc4236925d4aec3b4c23133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Bobot?= <francois.bobot@cea.fr> Date: Wed, 18 Jan 2023 17:46:32 +0100 Subject: [PATCH] [docker] Do not use 'docker manifest inspect' for the moment. Use default image version of ocaml/opam:ubuntu-ocaml-4.13 instead in template. --- docker/Dockerfile.template | 4 ++-- docker/Makefile | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile.template b/docker/Dockerfile.template index 858873c..41a08fb 100644 --- a/docker/Dockerfile.template +++ b/docker/Dockerfile.template @@ -21,9 +21,9 @@ ########################################################################## # Dockerfile for easy install and use of CAISAR. -#FROM ocaml/opam@sha256:9d471148a7acdaba15caa139710f89ca8668a191c0052eb1c80cb9729e337c40 +FROM ocaml/opam@sha256:9d471148a7acdaba15caa139710f89ca8668a191c0052eb1c80cb9729e337c40 -FROM @UBUNTU_OPAM_BASE@ +#FROM @UBUNTU_OPAM_BASE@ RUN opam-2.1 repository set-url default https://opam.ocaml.org && \ opam-2.1 update -y diff --git a/docker/Makefile b/docker/Makefile index c6fc41e..e08c13d 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -33,15 +33,14 @@ push: all @echo "You may need to execute 'docker login' beforehand." docker push laiser/caisar:pub -SHA_DOCKER=$(shell docker manifest inspect ocaml/opam:ubuntu-ocaml-$(OCAML_VERSION) | jq '.manifests| .[] | select(.platform.architecture == "amd64") | .digest' --raw-output) +SHA_DOCKER=$(shell docker manifest inspect ocaml/opam:ubuntu-ocaml-$(OCAML_VERSION) | jq '.manifests| .[] | select(.platform.architecture == "amd64") | .digest' --raw-output) CAISAR_COMMIT?=$(shell git rev-parse HEAD) Dockerfile: Makefile Dockerfile.template env.template FORCE - sed 's|@UBUNTU_OPAM_BASE@|ocaml/opam@$(SHA_DOCKER)|g' Dockerfile.template | \ + cat Dockerfile.template | \ sed 's|@ENV@|$(shell cat env.template)|g' | \ sed 's|@OPAM_DEPS@|conf-protoc conf-gmp conf-autoconf conf-pkg-config|' | \ sed 's|@OCAMLV@|'$(OCAML_VERSION)'|g' | \ sed 's|@CAISAR_COMMIT@|'$(CAISAR_COMMIT)'|g' | \ -sed 's|@CAISAR_COMMIT@|'$(CAISAR_COMMIT)'|g' | \ cat > $@ -- GitLab