From a8ed8e9aa565550a15a4f29ce07d69c1b2e724e6 Mon Sep 17 00:00:00 2001
From: Laurent BEAULATON <laurent.beaulaton@ofb.gouv.fr>
Date: Thu, 27 Feb 2025 10:39:28 +0100
Subject: [PATCH 01/23] test cache
---
.gitlab-ci.yml | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ae6400d..62eec69 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,6 +20,15 @@ variables:
PG_DB: bd_contmig_nat
PG_HOST: host_db
PG_PORT: 5432
+ R_LIBS_USER: ${CI_PROJECT_DIR}/ci/lib
+
+cache:
+ key: cache-$CI_COMMIT_REF_SLUG
+ fallback_keys:
+ - cache-$CI_DEFAULT_BRANCH
+ - cache-default
+ paths:
+ - ${R_LIBS_USER}
include:
- local: '/gitlab-ci/rules.gitlab-ci.yml' # generic rules to be used for main branch or others
--
GitLab
From bb39aa6c9a039a00e0c6ac74d8f8e743c6c4bee2 Mon Sep 17 00:00:00 2001
From: Laurent BEAULATON <laurent.beaulaton@ofb.gouv.fr>
Date: Thu, 27 Feb 2025 10:47:46 +0100
Subject: [PATCH 02/23] typo
---
gitlab-ci/test_r.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gitlab-ci/test_r.gitlab-ci.yml b/gitlab-ci/test_r.gitlab-ci.yml
index 01ea043..af59a41 100644
--- a/gitlab-ci/test_r.gitlab-ci.yml
+++ b/gitlab-ci/test_r.gitlab-ci.yml
@@ -13,7 +13,7 @@
#######################
# for any branch, but main
test_r-dev:
- image: $CI_REGISTRY_IMAGE/$imageR_name:$r_base_version-$tag_dev
+ image: $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev
needs:
- build_db-dev
- build_R-dev
--
GitLab
From 9b9b6a0458ce0fd12b7193cb6cf26b0bd814c31f Mon Sep 17 00:00:00 2001
From: Laurent BEAULATON <laurent.beaulaton@ofb.gouv.fr>
Date: Thu, 27 Feb 2025 11:11:30 +0100
Subject: [PATCH 03/23] cache
---
.gitlab-ci.yml | 9 ---------
gitlab-ci/build_images_docker.gitlab-ci.yml | 3 ++-
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 62eec69..ae6400d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,15 +20,6 @@ variables:
PG_DB: bd_contmig_nat
PG_HOST: host_db
PG_PORT: 5432
- R_LIBS_USER: ${CI_PROJECT_DIR}/ci/lib
-
-cache:
- key: cache-$CI_COMMIT_REF_SLUG
- fallback_keys:
- - cache-$CI_DEFAULT_BRANCH
- - cache-default
- paths:
- - ${R_LIBS_USER}
include:
- local: '/gitlab-ci/rules.gitlab-ci.yml' # generic rules to be used for main branch or others
diff --git a/gitlab-ci/build_images_docker.gitlab-ci.yml b/gitlab-ci/build_images_docker.gitlab-ci.yml
index 944bd5d..8881ea7 100644
--- a/gitlab-ci/build_images_docker.gitlab-ci.yml
+++ b/gitlab-ci/build_images_docker.gitlab-ci.yml
@@ -49,7 +49,8 @@ build_R-dev:
- .rules_other
script:
- echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin
- - docker build -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -f R.dockerfile .
+ - docker build --cache-to type=registry,ref=$CI_REGISTRY_IMAGE/cache-image,mode=max
+ --cache-from type=registry,ref=$CI_REGISTRY_IMAGE/cache-image -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -f R.dockerfile .
- docker push --all-tags $CI_REGISTRY_IMAGE/$imageR_name
#######################
--
GitLab
From 20192cdd643dc66b848dd85526861f774e1a472f Mon Sep 17 00:00:00 2001
From: Laurent BEAULATON <laurent.beaulaton@ofb.gouv.fr>
Date: Thu, 27 Feb 2025 11:15:14 +0100
Subject: [PATCH 04/23] up
---
gitlab-ci/build_images_docker.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gitlab-ci/build_images_docker.gitlab-ci.yml b/gitlab-ci/build_images_docker.gitlab-ci.yml
index 8881ea7..cb83176 100644
--- a/gitlab-ci/build_images_docker.gitlab-ci.yml
+++ b/gitlab-ci/build_images_docker.gitlab-ci.yml
@@ -14,7 +14,7 @@ build_db-dev:
- .rules_other
script:
- echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin
- - docker build --build-arg postgresql_version=$postgres_version --build-arg postgis_version=$postgis_version
+ - docker buildx build --build-arg postgresql_version=$postgres_version --build-arg postgis_version=$postgis_version
-t $CI_REGISTRY_IMAGE/$imagedb_name:$db_version-pg$postgres_version-ps$postgis_version-$tag_dev -f db.dockerfile .
- docker push --all-tags $CI_REGISTRY_IMAGE/$imagedb_name
--
GitLab
From 3df08dfccc41693683d1995c4dcfae859ed274bf Mon Sep 17 00:00:00 2001
From: Laurent BEAULATON <laurent.beaulaton@ofb.gouv.fr>
Date: Thu, 27 Feb 2025 11:21:04 +0100
Subject: [PATCH 05/23] pfff
---
gitlab-ci/build_images_docker.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gitlab-ci/build_images_docker.gitlab-ci.yml b/gitlab-ci/build_images_docker.gitlab-ci.yml
index cb83176..31f1533 100644
--- a/gitlab-ci/build_images_docker.gitlab-ci.yml
+++ b/gitlab-ci/build_images_docker.gitlab-ci.yml
@@ -14,7 +14,7 @@ build_db-dev:
- .rules_other
script:
- echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin
- - docker buildx build --build-arg postgresql_version=$postgres_version --build-arg postgis_version=$postgis_version
+ - docker build --build-arg postgresql_version=$postgres_version --build-arg postgis_version=$postgis_version
-t $CI_REGISTRY_IMAGE/$imagedb_name:$db_version-pg$postgres_version-ps$postgis_version-$tag_dev -f db.dockerfile .
- docker push --all-tags $CI_REGISTRY_IMAGE/$imagedb_name
@@ -49,7 +49,7 @@ build_R-dev:
- .rules_other
script:
- echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin
- - docker build --cache-to type=registry,ref=$CI_REGISTRY_IMAGE/cache-image,mode=max
+ - docker buildx build --cache-to type=registry,ref=$CI_REGISTRY_IMAGE/cache-image,mode=max
--cache-from type=registry,ref=$CI_REGISTRY_IMAGE/cache-image -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -f R.dockerfile .
- docker push --all-tags $CI_REGISTRY_IMAGE/$imageR_name
--
GitLab
From 3639c05e710f3749739f331b78c03355a6039f5a Mon Sep 17 00:00:00 2001
From: Laurent BEAULATON <laurent.beaulaton@ofb.gouv.fr>
Date: Thu, 27 Feb 2025 11:24:07 +0100
Subject: [PATCH 06/23] up
---
gitlab-ci/build_images_docker.gitlab-ci.yml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gitlab-ci/build_images_docker.gitlab-ci.yml b/gitlab-ci/build_images_docker.gitlab-ci.yml
index 31f1533..aa1ea3e 100644
--- a/gitlab-ci/build_images_docker.gitlab-ci.yml
+++ b/gitlab-ci/build_images_docker.gitlab-ci.yml
@@ -49,8 +49,10 @@ build_R-dev:
- .rules_other
script:
- echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin
- - docker buildx build --cache-to type=registry,ref=$CI_REGISTRY_IMAGE/cache-image,mode=max
- --cache-from type=registry,ref=$CI_REGISTRY_IMAGE/cache-image -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -f R.dockerfile .
+ - docker context create my-builder
+ - docker buildx create my-builder --driver docker-container --use
+ - docker buildx build --cache-to type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image,mode=max
+ --cache-from type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -f R.dockerfile .
- docker push --all-tags $CI_REGISTRY_IMAGE/$imageR_name
#######################
--
GitLab
From 8e4135abf11dd381d490d1d289783b96a2620487 Mon Sep 17 00:00:00 2001
From: Laurent BEAULATON <laurent.beaulaton@ofb.gouv.fr>
Date: Thu, 27 Feb 2025 11:34:15 +0100
Subject: [PATCH 07/23] up
---
gitlab-ci/build_images_docker.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gitlab-ci/build_images_docker.gitlab-ci.yml b/gitlab-ci/build_images_docker.gitlab-ci.yml
index aa1ea3e..a374162 100644
--- a/gitlab-ci/build_images_docker.gitlab-ci.yml
+++ b/gitlab-ci/build_images_docker.gitlab-ci.yml
@@ -51,9 +51,7 @@ build_R-dev:
- echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin
- docker context create my-builder
- docker buildx create my-builder --driver docker-container --use
- - docker buildx build --cache-to type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image,mode=max
- --cache-from type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -f R.dockerfile .
- - docker push --all-tags $CI_REGISTRY_IMAGE/$imageR_name
+ - docker buildx build --cache-to type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image,mode=max --cache-from type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image --push -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -f R.dockerfile .
#######################
# for main banch only
@@ -67,7 +65,9 @@ build_R-prod:
when: manual
script:
- echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin
- - docker build -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version -f R.dockerfile .
+ - docker context create my-builder
+ - docker buildx create my-builder --driver docker-container --use
+ - docker buildx build --cache-to type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image,mode=max --cache-from type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version -f R.dockerfile .
- docker tag $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version $CI_REGISTRY_IMAGE/$imageR_name:latest
- docker push --all-tags $CI_REGISTRY_IMAGE/$imageR_name
\ No newline at end of file
--
GitLab
From b215b8fcdaf00c5af65619c1d83dbed870b5979b Mon Sep 17 00:00:00 2001
From: Laurent BEAULATON <laurent.beaulaton@ofb.gouv.fr>
Date: Thu, 27 Feb 2025 11:51:46 +0100
Subject: [PATCH 08/23] =?UTF-8?q?fix=20=C3=89tiquette=20non=20valide=20:?=
=?UTF-8?q?=20empreinte=20du=20manifeste=20manquante?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
gitlab-ci/build_images_docker.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gitlab-ci/build_images_docker.gitlab-ci.yml b/gitlab-ci/build_images_docker.gitlab-ci.yml
index a374162..392632b 100644
--- a/gitlab-ci/build_images_docker.gitlab-ci.yml
+++ b/gitlab-ci/build_images_docker.gitlab-ci.yml
@@ -51,7 +51,7 @@ build_R-dev:
- echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin
- docker context create my-builder
- docker buildx create my-builder --driver docker-container --use
- - docker buildx build --cache-to type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image,mode=max --cache-from type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image --push -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -f R.dockerfile .
+ - docker buildx build --sbom=true --provenance=true --cache-to type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image,mode=max --cache-from type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image --push -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -f R.dockerfile .
#######################
# for main banch only
--
GitLab
From 683decd74f04c97747b211ba3b22a0da6dda0a67 Mon Sep 17 00:00:00 2001
From: Laurent BEAULATON <laurent.beaulaton@ofb.gouv.fr>
Date: Thu, 27 Feb 2025 14:05:25 +0100
Subject: [PATCH 09/23] avec build
---
gitlab-ci/build_images_docker.gitlab-ci.yml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gitlab-ci/build_images_docker.gitlab-ci.yml b/gitlab-ci/build_images_docker.gitlab-ci.yml
index 392632b..ea9b129 100644
--- a/gitlab-ci/build_images_docker.gitlab-ci.yml
+++ b/gitlab-ci/build_images_docker.gitlab-ci.yml
@@ -49,9 +49,10 @@ build_R-dev:
- .rules_other
script:
- echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin
- - docker context create my-builder
- - docker buildx create my-builder --driver docker-container --use
- - docker buildx build --sbom=true --provenance=true --cache-to type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image,mode=max --cache-from type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image --push -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -f R.dockerfile .
+ # - docker context create my-builder
+ # - docker buildx create my-builder --driver docker-container --use
+ - docker build --cache-to type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image,mode=max --cache-from type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -f R.dockerfile .
+ - docker push --all-tags $CI_REGISTRY_IMAGE/$imageR_name
#######################
# for main banch only
--
GitLab
From eb7ae5f483d1de6dfdce87274061e8d6800654ee Mon Sep 17 00:00:00 2001
From: Laurent BEAULATON <laurent.beaulaton@ofb.gouv.fr>
Date: Thu, 27 Feb 2025 14:11:34 +0100
Subject: [PATCH 10/23] up
---
gitlab-ci/build_images_docker.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gitlab-ci/build_images_docker.gitlab-ci.yml b/gitlab-ci/build_images_docker.gitlab-ci.yml
index ea9b129..9fe30fa 100644
--- a/gitlab-ci/build_images_docker.gitlab-ci.yml
+++ b/gitlab-ci/build_images_docker.gitlab-ci.yml
@@ -51,7 +51,7 @@ build_R-dev:
- echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin
# - docker context create my-builder
# - docker buildx create my-builder --driver docker-container --use
- - docker build --cache-to type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image,mode=max --cache-from type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -f R.dockerfile .
+ - docker build --build-arg BUILDKIT_INLINE_CACHE=1 --cache-to type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image,mode=max --cache-from type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -f R.dockerfile .
- docker push --all-tags $CI_REGISTRY_IMAGE/$imageR_name
#######################
--
GitLab
From dcc34f62ae2dd8990886a01fde61744f2664fa83 Mon Sep 17 00:00:00 2001
From: Laurent BEAULATON <laurent.beaulaton@ofb.gouv.fr>
Date: Thu, 27 Feb 2025 14:14:09 +0100
Subject: [PATCH 11/23] =?UTF-8?q?passage=20=C3=A0=20docker=2028.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ae6400d..055e457 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ variables:
r_version: "0.1"
imageR_name: "r4stacomi"
r_base_version: "4.x"
- docker_version: "20.10"
+ docker_version: "28.0"
docker_version_dind: "${docker_version}-dind"
PG_USER: stacomi_test
PG_USER_PASSWORD: stacomi_test
--
GitLab
From 3b6a6b5f50d115a0bc18fa4439103b0698c8764b Mon Sep 17 00:00:00 2001
From: Laurent BEAULATON <laurent.beaulaton@ofb.gouv.fr>
Date: Thu, 27 Feb 2025 14:26:20 +0100
Subject: [PATCH 12/23] up
---
gitlab-ci/build_images_docker.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gitlab-ci/build_images_docker.gitlab-ci.yml b/gitlab-ci/build_images_docker.gitlab-ci.yml
index 9fe30fa..1393386 100644
--- a/gitlab-ci/build_images_docker.gitlab-ci.yml
+++ b/gitlab-ci/build_images_docker.gitlab-ci.yml
@@ -49,10 +49,10 @@ build_R-dev:
- .rules_other
script:
- echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin
- # - docker context create my-builder
- # - docker buildx create my-builder --driver docker-container --use
- - docker build --build-arg BUILDKIT_INLINE_CACHE=1 --cache-to type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image,mode=max --cache-from type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -f R.dockerfile .
- - docker push --all-tags $CI_REGISTRY_IMAGE/$imageR_name
+ - docker context create my-builder
+ - docker buildx create my-builder --driver docker-container --use
+ - docker buildx build --push --cache-to type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image,mode=max --cache-from type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -f R.dockerfile .
+ # - docker push --all-tags $CI_REGISTRY_IMAGE/$imageR_name
#######################
# for main banch only
--
GitLab
From d4cbe2c4812013f4b9955ce4795c73614aebc99d Mon Sep 17 00:00:00 2001
From: Laurent BEAULATON <laurent.beaulaton@ofb.gouv.fr>
Date: Thu, 27 Feb 2025 14:35:35 +0100
Subject: [PATCH 13/23] up
---
gitlab-ci/build_images_docker.gitlab-ci.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gitlab-ci/build_images_docker.gitlab-ci.yml b/gitlab-ci/build_images_docker.gitlab-ci.yml
index 1393386..1a62d55 100644
--- a/gitlab-ci/build_images_docker.gitlab-ci.yml
+++ b/gitlab-ci/build_images_docker.gitlab-ci.yml
@@ -50,7 +50,8 @@ build_R-dev:
script:
- echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin
- docker context create my-builder
- - docker buildx create my-builder --driver docker-container --use
+ - docker context ls
+ - docker buildx create --driver docker-container --use
- docker buildx build --push --cache-to type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image,mode=max --cache-from type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -f R.dockerfile .
# - docker push --all-tags $CI_REGISTRY_IMAGE/$imageR_name
--
GitLab
From cbedd5a6ac9510d05eed56f3858eff5a7feae05b Mon Sep 17 00:00:00 2001
From: Laurent BEAULATON <laurent.beaulaton@ofb.gouv.fr>
Date: Thu, 27 Feb 2025 14:40:16 +0100
Subject: [PATCH 14/23] fix
---
gitlab-ci/build_images_docker.gitlab-ci.yml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gitlab-ci/build_images_docker.gitlab-ci.yml b/gitlab-ci/build_images_docker.gitlab-ci.yml
index 1a62d55..705a33c 100644
--- a/gitlab-ci/build_images_docker.gitlab-ci.yml
+++ b/gitlab-ci/build_images_docker.gitlab-ci.yml
@@ -49,11 +49,11 @@ build_R-dev:
- .rules_other
script:
- echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin
- - docker context create my-builder
- - docker context ls
- - docker buildx create --driver docker-container --use
- - docker buildx build --push --cache-to type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image,mode=max --cache-from type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -f R.dockerfile .
- # - docker push --all-tags $CI_REGISTRY_IMAGE/$imageR_name
+ # - docker context create my-builder
+ # - docker context ls
+ # - docker buildx create --driver docker-container --use
+ - docker -build-arg BUILDKIT_INLINE_CACHE=1 --cache-from $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -f R.dockerfile .
+ - docker push --all-tags $CI_REGISTRY_IMAGE/$imageR_name
#######################
# for main banch only
--
GitLab
From 6c3dd4dbbc4536b0f9dac1d990d7da56390f7eb3 Mon Sep 17 00:00:00 2001
From: Laurent BEAULATON <laurent.beaulaton@ofb.gouv.fr>
Date: Thu, 27 Feb 2025 14:42:19 +0100
Subject: [PATCH 15/23] up
---
gitlab-ci/build_images_docker.gitlab-ci.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gitlab-ci/build_images_docker.gitlab-ci.yml b/gitlab-ci/build_images_docker.gitlab-ci.yml
index 705a33c..d6d5add 100644
--- a/gitlab-ci/build_images_docker.gitlab-ci.yml
+++ b/gitlab-ci/build_images_docker.gitlab-ci.yml
@@ -52,7 +52,8 @@ build_R-dev:
# - docker context create my-builder
# - docker context ls
# - docker buildx create --driver docker-container --use
- - docker -build-arg BUILDKIT_INLINE_CACHE=1 --cache-from $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -f R.dockerfile .
+ - docker pull $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_de
+ - docker --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -f R.dockerfile .
- docker push --all-tags $CI_REGISTRY_IMAGE/$imageR_name
#######################
--
GitLab
From 18a1c49669848718db8ec6828151837585880a4b Mon Sep 17 00:00:00 2001
From: Laurent BEAULATON <laurent.beaulaton@ofb.gouv.fr>
Date: Thu, 27 Feb 2025 14:46:04 +0100
Subject: [PATCH 16/23] pff
---
gitlab-ci/build_images_docker.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gitlab-ci/build_images_docker.gitlab-ci.yml b/gitlab-ci/build_images_docker.gitlab-ci.yml
index d6d5add..d023ee6 100644
--- a/gitlab-ci/build_images_docker.gitlab-ci.yml
+++ b/gitlab-ci/build_images_docker.gitlab-ci.yml
@@ -52,7 +52,7 @@ build_R-dev:
# - docker context create my-builder
# - docker context ls
# - docker buildx create --driver docker-container --use
- - docker pull $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_de
+ - docker pull $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev
- docker --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -f R.dockerfile .
- docker push --all-tags $CI_REGISTRY_IMAGE/$imageR_name
--
GitLab
From 72a20afcac9a9d854b8d0f787384f31d25ca54e2 Mon Sep 17 00:00:00 2001
From: Laurent BEAULATON <laurent.beaulaton@ofb.gouv.fr>
Date: Thu, 27 Feb 2025 14:49:15 +0100
Subject: [PATCH 17/23] latest
---
gitlab-ci/build_images_docker.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gitlab-ci/build_images_docker.gitlab-ci.yml b/gitlab-ci/build_images_docker.gitlab-ci.yml
index d023ee6..1fde014 100644
--- a/gitlab-ci/build_images_docker.gitlab-ci.yml
+++ b/gitlab-ci/build_images_docker.gitlab-ci.yml
@@ -52,8 +52,8 @@ build_R-dev:
# - docker context create my-builder
# - docker context ls
# - docker buildx create --driver docker-container --use
- - docker pull $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev
- - docker --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -f R.dockerfile .
+ - docker pull $CI_REGISTRY_IMAGE/$imageR_name
+ - docker --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from $CI_REGISTRY_IMAGE/$imageR_name -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -f R.dockerfile .
- docker push --all-tags $CI_REGISTRY_IMAGE/$imageR_name
#######################
--
GitLab
From 68096c656ce92a42ff9e107e6ba52da40d0b1c16 Mon Sep 17 00:00:00 2001
From: Laurent BEAULATON <laurent.beaulaton@ofb.gouv.fr>
Date: Thu, 27 Feb 2025 15:08:45 +0100
Subject: [PATCH 18/23] on s'en passe
---
gitlab-ci/R/test_BDD.R | 2 +-
gitlab-ci/test_r.gitlab-ci.yml | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/gitlab-ci/R/test_BDD.R b/gitlab-ci/R/test_BDD.R
index 4d3bf4c..233c9f9 100644
--- a/gitlab-ci/R/test_BDD.R
+++ b/gitlab-ci/R/test_BDD.R
@@ -1,4 +1,4 @@
-require("RPostgreSQL")
+require("RPostgres")
require("sqldf")
options(
diff --git a/gitlab-ci/test_r.gitlab-ci.yml b/gitlab-ci/test_r.gitlab-ci.yml
index af59a41..7012056 100644
--- a/gitlab-ci/test_r.gitlab-ci.yml
+++ b/gitlab-ci/test_r.gitlab-ci.yml
@@ -13,10 +13,9 @@
#######################
# for any branch, but main
test_r-dev:
- image: $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev
+ image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/rocker/verse
needs:
- build_db-dev
- - build_R-dev
- test_psql-dev
extends:
- .rules_other
--
GitLab
From 4ce829e5e3bb5d88162fa1d7399e2539763b39ff Mon Sep 17 00:00:00 2001
From: Laurent BEAULATON <laurent.beaulaton@ofb.gouv.fr>
Date: Thu, 27 Feb 2025 15:15:35 +0100
Subject: [PATCH 19/23] up
---
gitlab-ci/R/test_BDD.R | 1 +
1 file changed, 1 insertion(+)
diff --git a/gitlab-ci/R/test_BDD.R b/gitlab-ci/R/test_BDD.R
index 233c9f9..e56408d 100644
--- a/gitlab-ci/R/test_BDD.R
+++ b/gitlab-ci/R/test_BDD.R
@@ -1,4 +1,5 @@
require("RPostgres")
+install.packages("sqldf")
require("sqldf")
options(
--
GitLab
From 36a6a23225cefe10a07d58137ceaf59aee9942fc Mon Sep 17 00:00:00 2001
From: Laurent BEAULATON <laurent.beaulaton@ofb.gouv.fr>
Date: Thu, 27 Feb 2025 15:39:52 +0100
Subject: [PATCH 20/23] up
---
gitlab-ci/R/test_BDD.R | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gitlab-ci/R/test_BDD.R b/gitlab-ci/R/test_BDD.R
index e56408d..3aebc27 100644
--- a/gitlab-ci/R/test_BDD.R
+++ b/gitlab-ci/R/test_BDD.R
@@ -1,4 +1,5 @@
-require("RPostgres")
+install.packages("RPostgreSQL")
+require("RPostgreSQL")
install.packages("sqldf")
require("sqldf")
--
GitLab
From e9e4ee90d17a9207e5b19e990b385b823246e973 Mon Sep 17 00:00:00 2001
From: Laurent BEAULATON <laurent.beaulaton@ofb.gouv.fr>
Date: Thu, 27 Feb 2025 15:49:31 +0100
Subject: [PATCH 21/23] revert
---
.gitlab-ci.yml | 2 +-
gitlab-ci/build_images_docker.gitlab-ci.yml | 44 +--------------------
2 files changed, 3 insertions(+), 43 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 055e457..ae6400d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ variables:
r_version: "0.1"
imageR_name: "r4stacomi"
r_base_version: "4.x"
- docker_version: "28.0"
+ docker_version: "20.10"
docker_version_dind: "${docker_version}-dind"
PG_USER: stacomi_test
PG_USER_PASSWORD: stacomi_test
diff --git a/gitlab-ci/build_images_docker.gitlab-ci.yml b/gitlab-ci/build_images_docker.gitlab-ci.yml
index 1fde014..c791cfb 100644
--- a/gitlab-ci/build_images_docker.gitlab-ci.yml
+++ b/gitlab-ci/build_images_docker.gitlab-ci.yml
@@ -9,7 +9,7 @@ build_db-dev:
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:$docker_version
stage: build_images
services:
- - docker:$docker_version_dind
+ - ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:$docker_version_dind
extends:
- .rules_other
script:
@@ -24,7 +24,7 @@ build_db-prod:
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:$docker_version
stage: build_images
services:
- - docker:$docker_version_dind
+ - ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:$docker_version_dind
extends:
- .rules_main
when: manual
@@ -34,43 +34,3 @@ build_db-prod:
-t $CI_REGISTRY_IMAGE/$imagedb_name:$db_version-pg$postgres_version-ps$postgis_version -f db.dockerfile .
- docker tag $CI_REGISTRY_IMAGE/$imagedb_name:$db_version-pg$postgres_version-ps$postgis_version $CI_REGISTRY_IMAGE/$imagedb_name:latest
- docker push --all-tags $CI_REGISTRY_IMAGE/$imagedb_name
-
-#######################
-# R for stacomi
-
-#######################
-# for any branch, but main
-build_R-dev:
- image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:$docker_version
- stage: build_images
- services:
- - docker:$docker_version_dind
- extends:
- - .rules_other
- script:
- - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin
- # - docker context create my-builder
- # - docker context ls
- # - docker buildx create --driver docker-container --use
- - docker pull $CI_REGISTRY_IMAGE/$imageR_name
- - docker --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from $CI_REGISTRY_IMAGE/$imageR_name -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version-$tag_dev -f R.dockerfile .
- - docker push --all-tags $CI_REGISTRY_IMAGE/$imageR_name
-
-#######################
-# for main banch only
-build_R-prod:
- image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:$docker_version
- stage: build_images
- services:
- - docker:$docker_version_dind
- extends:
- - .rules_main
- when: manual
- script:
- - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin
- - docker context create my-builder
- - docker buildx create my-builder --driver docker-container --use
- - docker buildx build --cache-to type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image,mode=max --cache-from type=registry,ref=$CI_REGISTRY_IMAGE/r-cache-image -t $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version -f R.dockerfile .
- - docker tag $CI_REGISTRY_IMAGE/$imageR_name:$r_version-R$r_base_version $CI_REGISTRY_IMAGE/$imageR_name:latest
- - docker push --all-tags $CI_REGISTRY_IMAGE/$imageR_name
-
\ No newline at end of file
--
GitLab
From 9d6b4b6ec8953ae445b5a29a7c52ef000cacd677 Mon Sep 17 00:00:00 2001
From: Laurent BEAULATON <laurent.beaulaton@ofb.gouv.fr>
Date: Thu, 27 Feb 2025 15:51:15 +0100
Subject: [PATCH 22/23] up
---
gitlab-ci/test_r.gitlab-ci.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/gitlab-ci/test_r.gitlab-ci.yml b/gitlab-ci/test_r.gitlab-ci.yml
index 7012056..11390aa 100644
--- a/gitlab-ci/test_r.gitlab-ci.yml
+++ b/gitlab-ci/test_r.gitlab-ci.yml
@@ -29,7 +29,6 @@ test_r-prod:
image: $CI_REGISTRY_IMAGE/$imageR_name:latest
needs:
- build_db-prod
- - build_R-prod
extends:
- .rules_main
- .service-pg-prod
--
GitLab
From d739de225be5117295c87282f05535347f68c80c Mon Sep 17 00:00:00 2001
From: Laurent BEAULATON <laurent.beaulaton@ofb.gouv.fr>
Date: Thu, 27 Feb 2025 15:53:53 +0100
Subject: [PATCH 23/23] up
---
gitlab-ci/build_images_docker.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gitlab-ci/build_images_docker.gitlab-ci.yml b/gitlab-ci/build_images_docker.gitlab-ci.yml
index c791cfb..e1b3c3a 100644
--- a/gitlab-ci/build_images_docker.gitlab-ci.yml
+++ b/gitlab-ci/build_images_docker.gitlab-ci.yml
@@ -9,7 +9,7 @@ build_db-dev:
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:$docker_version
stage: build_images
services:
- - ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:$docker_version_dind
+ - docker:$docker_version_dind
extends:
- .rules_other
script:
@@ -24,7 +24,7 @@ build_db-prod:
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:$docker_version
stage: build_images
services:
- - ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:$docker_version_dind
+ - docker:$docker_version_dind
extends:
- .rules_main
when: manual
--
GitLab