Skip to content
GitLab
Commit 1eced173 authored by Vincent Delbar's avatar Vincent Delbar
Browse files

ENH: Docker use subregistry (url moringa/base:tag)

parent 8d38ea17
develop master
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 12 additions and 10 deletions
+12 -10
docker/README.md
+ 11
− 9
View file @ 1eced173
...@@ -102,15 +102,17 @@ cd moringa ...@@ -102,15 +102,17 @@ cd moringa
docker login gitlab-registry.irstea.fr docker login gitlab-registry.irstea.fr
# OTB base image, example with tag 7.2.0 (default value is release-7.2) # OTB base image, example with tag 7.2.0 (default value is release-7.2)
# It is located in subregistry gitlab-registry.irstea.fr/raffaele.gaetano/moringa/base
docker build --build-arg OTB_BRANCH=7.2.0 -f docker/base-otb/Dockerfile \ docker build --build-arg OTB_BRANCH=7.2.0 -f docker/base-otb/Dockerfile \
-t gitlab-registry.irstea.fr/raffaele.gaetano/moringa:base-focal-otb72 . -t gitlab-registry.irstea.fr/raffaele.gaetano/moringa/base:focal-otb72 .
docker push gitlab-registry.irstea.fr/raffaele.gaetano/moringa:base-focal-otb72 docker push gitlab-registry.irstea.fr/raffaele.gaetano/moringa/base:focal-otb72
# Tag 'base-otb' == default base image for the moringa build # Tag 'moringa/base:latest' == default base image for the moringa build
docker tag gitlab-registry.irstea.fr/raffaele.gaetano/moringa:base-focal-otb72 \ docker tag gitlab-registry.irstea.fr/raffaele.gaetano/moringa/base:focal-otb72 \
gitlab-registry.irstea.fr/raffaele.gaetano/moringa:base-otb gitlab-registry.irstea.fr/raffaele.gaetano/moringa/base:latest
docker push gitlab-registry.irstea.fr/raffaele.gaetano/moringa:base-otb # Latest is default tag
docker push gitlab-registry.irstea.fr/raffaele.gaetano/moringa/base
# MORINGA build from the default 'base-otb' image # MORINGA build from the default 'base-otb' image
# You don't need to rebuild OTB if you just want to update moringa files using current branch / local commits # You don't need to rebuild OTB if you just want to update moringa files using current branch / local commits
...@@ -120,8 +122,8 @@ docker push gitlab-registry.irstea.fr/raffaele.gaetano/moringa:latest ...@@ -120,8 +122,8 @@ docker push gitlab-registry.irstea.fr/raffaele.gaetano/moringa:latest
# Build with custom ubuntu base image # Build with custom ubuntu base image
docker build --build-arg BASE_IMG=ubuntu:18.04 -f docker/base-otb/Dockerfile \ docker build --build-arg BASE_IMG=ubuntu:18.04 -f docker/base-otb/Dockerfile \
-t gitlab-registry.irstea.fr/raffaele.gaetano/moringa:base-bionic-otb72 . -t gitlab-registry.irstea.fr/raffaele.gaetano/moringa/base:bionic-otb72 .
docker push gitlab-registry.irstea.fr/raffaele.gaetano/moringa:base-bionic-otb72 docker push gitlab-registry.irstea.fr/raffaele.gaetano/moringa/base:bionic-otb72
``` ```
### Fix volume ownership issue (required if host's UID > 1000) ### Fix volume ownership issue (required if host's UID > 1000)
......
docker/moringa/Dockerfile
+ 1
− 1
View file @ 1eced173
ARG BASE_IMG=gitlab-registry.irstea.fr/raffaele.gaetano/moringa:base ARG BASE_IMG=gitlab-registry.irstea.fr/raffaele.gaetano/moringa/base:latest
FROM $BASE_IMG FROM $BASE_IMG
LABEL description="A container for the MORINGA processing chain, CIRAD/UMR TETIS" LABEL description="A container for the MORINGA processing chain, CIRAD/UMR TETIS"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment