Skip to content
Snippets Groups Projects
Commit 4eada030 authored by François Bobot's avatar François Bobot Committed by Michele Alberti
Browse files

[docker] Do not use 'docker manifest inspect' for the moment.

Use default image version of ocaml/opam:ubuntu-ocaml-4.13 instead in template.
parent 45c587c0
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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 > $@
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment