From 4a7dfce9b7ffeeffc77d1714df15e0cceac84bee Mon Sep 17 00:00:00 2001
From: LBeaulaton <laurent.beaulaton@ofb.gouv.fr>
Date: Sun, 30 Jan 2022 15:21:24 +0100
Subject: [PATCH 1/2] [docker] premier nettoyage
---
.gitlab-ci.yml | 14 --------------
Scripts/Script.sql | 0
environnement_test_r.dockerfile | 21 ---------------------
3 files changed, 35 deletions(-)
delete mode 100644 Scripts/Script.sql
delete mode 100644 environnement_test_r.dockerfile
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 92f3268..65155b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,5 @@
-
-
stages:
- build_db
-# - build_env_test
- test_psql
# - test_r
@@ -30,17 +27,6 @@ build_db:
- 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
-#build_env_test:
-# image: docker:latest
-# stage: build_env_test
-# services:
-# - docker:dind
-# script:
-# - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-# - docker build -t $CI_REGISTRY_IMAGE/$imager_name:$r_version -f environnement_test_r.dockerfile .
-# - docker tag $CI_REGISTRY_IMAGE/$imager_name:$r_version $CI_REGISTRY_IMAGE/$imager_name:latest
-# - docker push --all-tags $CI_REGISTRY_IMAGE/$imager_name
-
test_psql:
image: ubuntu
stage: test_psql
diff --git a/Scripts/Script.sql b/Scripts/Script.sql
deleted file mode 100644
index e69de29..0000000
diff --git a/environnement_test_r.dockerfile b/environnement_test_r.dockerfile
deleted file mode 100644
index 8008666..0000000
--- a/environnement_test_r.dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM registry.forgemia.inra.fr/stacomi/stacomi_db/stacomi_db:latest
-
-RUN (apt-get update && apt-get upgrade -y -q && apt-get -y -q autoclean && apt-get -y -q autoremove)
-
-# base d'utilitaires commun (pour mutualisation avec d'autres dockers)
-RUN apt-get update && apt-get install -y -q vim apt-utils \
- sudo wget unzip \
- # pour envsubst
- gettext-base \
- # pour pouvoir lancer les services avec systemctl depuis un docker (https://packages.debian.org/bullseye/systemctl)
- systemctl \
- && rm -rf /var/lib/apt/lists/*
-
-# installation des dépendances
-RUN apt-get update && apt-get install -y -q \
- r-base \
- r-base-dev \
- libpq-dev \
- && rm -rf /var/lib/apt/lists/*
-
-#CMD ["&& Rscript '1+1']
\ No newline at end of file
--
GitLab
From f210a594a88dbc8c2a66a1ec46e1d43ee214e332 Mon Sep 17 00:00:00 2001
From: LBeaulaton <laurent.beaulaton@ofb.gouv.fr>
Date: Sun, 30 Jan 2022 16:09:02 +0100
Subject: [PATCH 2/2] [docker] nettoyage
---
.gitlab-ci.yml | 2 --
1 file changed, 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65155b7..96c30d1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,8 +8,6 @@ variables:
db_version: "0.6.0"
postgres_version: "14"
postgis_version: "3.2"
- imager_name: "environnement_test_r"
- r_version: "0.1"
POSTGRES_PASSWORD: postgres
services:
--
GitLab