From 4f089fdad0af33a3721c6b4619dabe67e49f17c3 Mon Sep 17 00:00:00 2001 From: Simon C Date: Mon, 28 Nov 2022 10:51:11 +0100 Subject: [PATCH] =?UTF-8?q?feat:=20Suppression=20du=20d=C3=A9ploiement=20p?= =?UTF-8?q?ar=20Docker?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .dockerignore | 4 --- .drone.yml | 52 ++------------------------------------ .env | 2 -- Dockerfile | 4 --- docker-compose.prod.yml | 40 ----------------------------- docker-compose.staging.yml | 20 --------------- 6 files changed, 2 insertions(+), 120 deletions(-) delete mode 100644 .dockerignore delete mode 100644 Dockerfile delete mode 100644 docker-compose.prod.yml delete mode 100644 docker-compose.staging.yml diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index f205c0b..0000000 --- a/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -# Ignore everything -** - -!public diff --git a/.drone.yml b/.drone.yml index 1af3d08..e77c2ae 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,21 +1,3 @@ ---- -# drone encrypt weko/lestoitsduval $REGISTRY_PASSWORD -kind: secret -name: REGISTRY_PASSWORD -data: Q/Y+XPpJN0vxgDWzGVIVUZJ8PE0ngvYT/1NEFG+ZfnvoFa1c+ZSkhCeMk8OE/IC12Uw2VGebBsD1iCrkffKnA5GPIS+uCmtF1K/2o4+/ - ---- -# drone encrypt weko/lestoitsduval $REGISTRY_USER -kind: secret -name: REGISTRY_USER -data: wr3cyRh4G34wu8sbhEm96IUXZft0rDeGkkc5M/1N501H9Q== - ---- -# drone encrypt weko/lestoitsduval "{\"auths\":{\"https://registry.weko.io\":{\"auth\":\"$(echo -n "$REGISTRY_USER:$REGISTRY_PASSWORD" | base64)\",\"email\":\"$REGISTRY_USER\"}}}" -kind: secret -name: REGISTRY_CONFIG -data: lmQ25YQEai7VpYj8lUz9859JAV/aeQ9V5ulZhqVVQcni8usA9LF2IQFisekF69yu6ksp+9PBDHNKQA4GX7N/tFAlEdJySHUyr3qtrjUXRBs54E1G/GHVzY1/NwCytIT8Ro9d9H0XRiAbGnOQA2sjPFcb7CZ5kDZRmNHHHq6fplOdIM5ysYhiDIYH7TW+7dYm4ke8SBFhk4oKR7OMsAC+mo9++2dJ5W0FCro/ - --- # drone encrypt weko/lestoitsduval $DIRECTUS_URL kind: secret @@ -82,7 +64,7 @@ steps: - node scripts/directus-to-markdown/index.js - name: build website - image: jakejarvis/hugo-extended + image: klakegg/hugo:0.101.0-ext-debian-ci commands: - hugo --minify --environment production @@ -104,21 +86,6 @@ steps: commands: - hugo deploy --environment production -- name: push docker image on registry - image: plugins/docker - settings: - username: - from_secret: REGISTRY_USER - password: - from_secret: REGISTRY_PASSWORD - repo: registry.weko.io/lestoitsduval - registry: registry.weko.io - tags: - - latest - -image_pull_secrets: -- REGISTRY_CONFIG - volumes: - name: hugo-theme-lowtech_node_modules host: @@ -154,7 +121,7 @@ steps: - DRAFT=true node scripts/directus-to-markdown/index.js - name: build website - image: jakejarvis/hugo-extended + image: klakegg/hugo:0.101.0-ext-debian-ci commands: - hugo --minify --buildDrafts --buildFuture --environment staging @@ -176,21 +143,6 @@ steps: commands: - hugo deploy --environment staging -- name: push docker image on registry - image: plugins/docker - settings: - username: - from_secret: REGISTRY_USER - password: - from_secret: REGISTRY_PASSWORD - repo: registry.weko.io/lestoitsduval - registry: registry.weko.io - tags: - - staging - -image_pull_secrets: -- REGISTRY_CONFIG - volumes: - name: hugo-theme-lowtech_node_modules host: diff --git a/.env b/.env index 02faf21..8c0bede 100644 --- a/.env +++ b/.env @@ -1,5 +1,3 @@ -DOCKER_CONTEXT=vert.weko.resilien NAME=ltdv URL=lestoitsduval.fr -STATS_CONTAINER=ltdv-stats DIRECTUS_URL=https://contenu.${URL} diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 322c3a4..0000000 --- a/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM registry.weko.io/nginx-lowtech:0.1.0 - -# Copie des sources du site -COPY public /usr/share/nginx/html diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml deleted file mode 100644 index a140689..0000000 --- a/docker-compose.prod.yml +++ /dev/null @@ -1,40 +0,0 @@ -version: "3.8" - -volumes: - ltdv-log: - name: ltdv-log - ltdv-stats: - name: ltdv-stats - -services: - ltdv-prod: - container_name: ltdv-prod - build: . - image: registry.weko.io/lestoitsduval:latest - restart: always - labels: - - "traefik.enable=true" - - "traefik.http.routers.ltdv-prod.rule=Host(`${URL}`)" - - "traefik.http.routers.ltdv-prod.entrypoints=web" - - "com.centurylinklabs.watchtower.enable=true" - volumes: - - ltdv-log:/var/log/nginx - - ltdv-stats:/usr/share/nginx/html/stats - - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro - - ltdv-stats: - container_name: ltdv-stats - image: registry.weko.io/goaccess:1.5.1 - restart: always - depends_on: - - ltdv-prod - volumes: - - ltdv-log:/var/log/nginx - - ltdv-stats:/usr/share/nginx/html/stats - - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro - -networks: - default: - name: traefik diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml deleted file mode 100644 index 6675869..0000000 --- a/docker-compose.staging.yml +++ /dev/null @@ -1,20 +0,0 @@ -version: "3.8" - -networks: - default: - name: traefik - -services: - ltdv-staging: - container_name: ltdv-staging - build: . - image: registry.weko.io/lestoitsduval:staging - restart: always - labels: - - "traefik.enable=true" - - "traefik.http.routers.ltdv-staging.rule=Host(`staging.${URL}`)" - - "traefik.http.routers.ltdv-staging.entrypoints=web" - - "com.centurylinklabs.watchtower.enable=true" - volumes: - - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro