Skip to content

Commit 4144b74

Browse files
committed
Build and publish docker image on docker hub #24
1 parent 0902df7 commit 4144b74

3 files changed

Lines changed: 40 additions & 24 deletions

File tree

.gitlab-ci.yml

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,32 @@ variables:
99
include:
1010
- project: 'sertit/groupware'
1111
file: '/ci_templates/arcgis_plugin.yaml'
12+
- project: 'sertit/groupware'
13+
file: '/ci_templates/deploy_gitlab_registry.yaml'
1214

13-
trigger_sertit_atools:
15+
deploy:sertit_atools:
1416
extends: .trigger_sertit_atools_update_tool
1517
variables:
1618
PROJECT_ROOT: "rusle"
1719

18-
deploy_registry:
19-
image: python:latest
20+
deploy:registry:
21+
extends: .upload_wheel
22+
23+
deploy:docker:
24+
extends: .deploy_container_bake
2025
stage: deploy
21-
script:
22-
- pip install build twine
23-
- python -m build
24-
- TWINE_PASSWORD=${CI_JOB_TOKEN} TWINE_USERNAME=gitlab-ci-token python -m twine upload --repository-url ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/pypi dist/*
26+
before_script:
27+
- docker login -u sertit -p$DOCKER_HUB_TOKEN
28+
- docker login $CI_REGISTRY -u $CI_REGISTRY_USER -p$CI_REGISTRY_PASSWORD
29+
variables:
30+
TARGET: "rusle"
2531
rules:
26-
# Deploy if tag
27-
- if: $CI_COMMIT_TAG
28-
when: on_success
29-
# Manual deploy if commit to the default branch
30-
- if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
31-
when: manual
32+
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
33+
when: manual
34+
variables:
35+
IMAGE_TAGS: "sertit/arcgispro-eo:rusle_stable,$CI_REGISTRY_IMAGE:stable"
36+
- if: $CI_COMMIT_BRANCH
37+
variables:
38+
IMAGE_TAGS: "sertit/arcgispro-eo:rusle_stable,$CI_REGISTRY_IMAGE:stable"
39+
needs:
40+
- deploy:registry

Dockerfile

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
FROM sertit/eo-containers:geo2
1+
FROM sertit/eo-containers:geo_latest
22

33
MAINTAINER Bastien Coriat
4-
ENV AWS_ACCESS_KEY_ID=***REMOVED***
5-
ENV AWS_SECRET_ACCESS_KEY=***REMOVED***
6-
ENV AWS_S3_ENDPOINT=s3.waw3-1.cloudferro.com
7-
ENV USE_S3_STORAGE=1
84

95
RUN apt-get update && apt-get install -y wget libgdal-dev build-essential
106
RUN pip install gdal==3.6.2
@@ -13,10 +9,6 @@ RUN wget https://f-tep.com/sites/default/files/pythonapi/ftep_api-0.0.16-py3-non
139
&& PYTHONPATH=/usr/lib/python3/dist-packages/ pip install ftep_api-0.0.16-py3-none-any.whl ftep_util-0.0.8-py3-none-any.whl \
1410
&& rm -f ftep_api-0.0.16-py3-none-any.whl ftep_util-0.0.8-py3-none-any.whl
1511

16-
RUN pip install --index-url https://__token__:glpat-xypsdgKBaMHiRvqraGj1@git.unistra.fr/api/v4/projects/26129/packages/pypi/simple rusle==2.3.2
12+
RUN pip install --index-url https://git.unistra.fr/api/v4/projects/26129/packages/pypi/simple rusle
1713
RUN pip install sertit==1.42.3
18-
RUN pip install numpy==1.26.4
19-
# Prepare processor script
20-
RUN mkdir -p /home/worker/processor
21-
# COPY * /home/worker/processor/
22-
# ENTRYPOINT ["/home/worker/processor/workflow.sh"]
14+
RUN pip install numpy==1.26.4

docker-bake.hcl

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
variable "IMAGE_TAGS" {
2+
default = "local"
3+
}
4+
5+
function "tag" {
6+
params = [tag]
7+
result = "${split(",", "${tag}")}"
8+
}
9+
10+
# Build geo open image
11+
target "rusle" {
12+
context = "."
13+
dockerfile = "Dockerfile"
14+
tags = "${tag("${IMAGE_TAGS}")}"
15+
}

0 commit comments

Comments
 (0)