Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
caisar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pub
caisar
Commits
dc623e37
Commit
dc623e37
authored
2 years ago
by
Michele Alberti
Browse files
Options
Downloads
Patches
Plain Diff
[docker] Fix Makefile to use default base image when 'docker manifest inspect' fails.
Avoid having the default image hardcoded in template.
parent
4eada030
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docker/Dockerfile.template
+2
-2
2 additions, 2 deletions
docker/Dockerfile.template
docker/Makefile
+2
-1
2 additions, 1 deletion
docker/Makefile
with
4 additions
and
3 deletions
docker/Dockerfile.template
+
2
−
2
View file @
dc623e37
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
docker/Makefile
+
2
−
1
View file @
dc623e37
...
...
@@ -34,11 +34,12 @@ push: all
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
:=
$(
or
$(
SHA_DOCKER
)
,sha256:9d471148a7acdaba15caa139710f89ca8668a191c0052eb1c80cb9729e337c40
)
CAISAR_COMMIT
?=
$(
shell git rev-parse HEAD
)
Dockerfile
:
Makefile Dockerfile.template env.template FORCE
cat
Dockerfile.template |
\
sed
's|@UBUNTU_OPAM_BASE@|ocaml/opam@
$(
SHA_DOCKER
)
|g'
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'
|
\
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment