diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 92f326858c8164d2a3118199fdc49762ef0e96fa..96c30d13efc027973508f886e4f129c62619edd4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,5 @@ - - stages: - build_db -# - build_env_test - test_psql # - test_r @@ -11,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: @@ -30,17 +25,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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/environnement_test_r.dockerfile b/environnement_test_r.dockerfile deleted file mode 100644 index 8008666c439b15452ead01165f926647505efe00..0000000000000000000000000000000000000000 --- 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