From 0ccc858eb99163b86e3ac1de6da4ed5dee224817 Mon Sep 17 00:00:00 2001 From: "maxime.rocher" Date: Wed, 4 Dec 2024 20:43:07 +0100 Subject: [PATCH 01/20] test deploy --- .drone.yml | 3 ++- scripts/init.sql | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 661cfb1..fd544c5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,7 +11,7 @@ steps: image: plugins/docker settings: dockerfile: docker/Dockerfile - context: scripts + context: . registry: hub.codefirst.iut.uca.fr mirror: https://proxy.iut.uca.fr:8443 repo: hub.codefirst.iut.uca.fr/wikifantasy/wf-database @@ -19,6 +19,7 @@ steps: from_secret: SECRET_REGISTRY_USERNAME password: from_secret: SECRET_REGISTRY_PASSWORD + - name: Deploy image: hub.codefirst.iut.uca.fr/celeste.barbosa/codefirst-dockerproxy-clientdrone environment: diff --git a/scripts/init.sql b/scripts/init.sql index ca47995..aef47bf 100644 --- a/scripts/init.sql +++ b/scripts/init.sql @@ -1,6 +1,7 @@ -- Suppression des tables DROP TABLE IF EXISTS Commentary; DROP TABLE IF EXISTS Favorite; +DROP TABLE IF EXISTS DailyQuote; DROP TABLE IF EXISTS Quote; DROP TABLE IF EXISTS Caracter; DROP TABLE IF EXISTS Source; @@ -102,7 +103,7 @@ CREATE TABLE Quote( CREATE TABLE DailyQuote( citation_id INT PRIMARY KEY, - FOREIGN KEY (citation_id) REFERENCES Citation(id) ON DELETE CASCADE + FOREIGN KEY (citation_id) REFERENCES Quote(id_quote) ON DELETE CASCADE ); From 1509ea3839851da3d54ae37d917711db3c96cebb Mon Sep 17 00:00:00 2001 From: "maxime.rocher" Date: Wed, 4 Dec 2024 20:47:05 +0100 Subject: [PATCH 02/20] encore test docker --- .dockerignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..ce1dafd --- /dev/null +++ b/.dockerignore @@ -0,0 +1,2 @@ +scripts/ + From 5836e8abf93f1b8ec5693df253a40c11ce6b1ae7 Mon Sep 17 00:00:00 2001 From: "maxime.rocher" Date: Wed, 4 Dec 2024 20:50:52 +0100 Subject: [PATCH 03/20] encore un --- docker-entrypoint-initdb.d/init.sql | 127 ++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 docker-entrypoint-initdb.d/init.sql diff --git a/docker-entrypoint-initdb.d/init.sql b/docker-entrypoint-initdb.d/init.sql new file mode 100644 index 0000000..aef47bf --- /dev/null +++ b/docker-entrypoint-initdb.d/init.sql @@ -0,0 +1,127 @@ +-- Suppression des tables +DROP TABLE IF EXISTS Commentary; +DROP TABLE IF EXISTS Favorite; +DROP TABLE IF EXISTS DailyQuote; +DROP TABLE IF EXISTS Quote; +DROP TABLE IF EXISTS Caracter; +DROP TABLE IF EXISTS Source; +DROP TABLE IF EXISTS Record_quiz; +DROP TABLE IF EXISTS Quiz_Question; +DROP TABLE IF EXISTS Quiz; +DROP TABLE IF EXISTS Question; +DROP TABLE IF EXISTS Admin; +DROP TABLE IF EXISTS Users; +DROP TABLE IF EXISTS Image; + +-- Création des tables + +CREATE TABLE Image( + id_img NUMERIC PRIMARY KEY, + imgPath varchar(100) NOT NULL UNIQUE +); + +CREATE TABLE Users( + id_user SERIAL PRIMARY KEY, + username varchar(50) NOT NULL, + email varchar(50) NOT NULL, + password varchar(100) NOT NULL, + img NUMERIC NOT NULL, + creation date NOT NULL, + CONSTRAINT unique_col UNIQUE (email), + CONSTRAINT fk_img FOREIGN KEY(img) REFERENCES Image(id_img) +); + +CREATE TABLE Admin( + users SERIAL PRIMARY KEY, + CONSTRAINT fk_user FOREIGN KEY(users) REFERENCES Users(id_user) +); + +CREATE TABLE Question( + id_question SERIAL PRIMARY KEY, + texte text NOT NULL UNIQUE, + answerA varchar(30) NOT NULL, + answerB varchar(30) NOT NULL, + answerC varchar(30) NOT NULL, + answerD varchar(30) NOT NULL, + cAnswer varchar(30) NOT NULL, + CONSTRAINT check_cAnswer CHECK (cAnswer = answerA OR cAnswer = answerB OR cAnswer = answerC OR cAnswer = answerD) +); + +CREATE TABLE Quiz( + id_quiz SERIAL PRIMARY KEY, + nb_quest numeric +); + +CREATE TABLE Quiz_Question( + quiz SERIAL NOT NULL, + question SERIAL NOT NULL, + PRIMARY KEY (quiz, question), + CONSTRAINT fk_quiz FOREIGN KEY(quiz) REFERENCES Quiz(id_quiz), + CONSTRAINT fk_question FOREIGN KEY(question) REFERENCES Question(id_question) +); + +CREATE TABLE Record_quiz( + users SERIAL NOT NULL, + quiz SERIAL NOT NULL, + nbPoint numeric DEFAULT '0', + timeQ numeric DEFAULT '0', + PRIMARY KEY (users, quiz), + CONSTRAINT fk_user FOREIGN KEY(users) REFERENCES Users(id_user), + CONSTRAINT fk_quiz FOREIGN KEY(quiz) REFERENCES Quiz(id_quiz), + CONSTRAINT err_nbPoint CHECK(nbPoint >= 0), + CONSTRAINT err_timeQ CHECK(timeQ >= 0) +); + +CREATE TABLE Source( + id_source SERIAL PRIMARY KEY, + title varchar(100) NOT NULL, + dateS numeric(4) NOT NULL +); + +CREATE TABLE Caracter( + id_caracter SERIAL PRIMARY KEY, + caracter varchar(100) NOT NULL, + id_img NUMERIC NOT NULL +); + +CREATE TABLE Quote( + id_quote SERIAL PRIMARY KEY, + content text NOT NULL, + likes numeric DEFAULT '0', + langue char(2) NOT NULL, + isValide boolean NOT NULL DEFAULT 'false', + reason varchar(100) NOT NULL, + id_caracter SERIAL NOT NULL, + id_source SERIAL NOT NULL, + id_user_verif SERIAL NOT NULL, + CONSTRAINT fk_caracter FOREIGN KEY(id_caracter) REFERENCES Caracter(id_caracter), + CONSTRAINT fk_source FOREIGN KEY(id_source) REFERENCES Source(id_source), + CONSTRAINT fk_userverif FOREIGN KEY(id_user_verif) REFERENCES Users(id_user), + CONSTRAINT err_nbLike CHECK (likes >= 0), + CONSTRAINT err_language CHECK (langue = 'fr' OR langue = 'en') +); + +CREATE TABLE DailyQuote( + citation_id INT PRIMARY KEY, + FOREIGN KEY (citation_id) REFERENCES Quote(id_quote) ON DELETE CASCADE +); + + +CREATE TABLE Favorite( + users SERIAL NOT NULL, + quote SERIAL NOT NULL, + PRIMARY KEY (users, quote), + CONSTRAINT fk_quote FOREIGN KEY(quote) REFERENCES Quote(id_quote), + CONSTRAINT fk_user FOREIGN KEY(users) REFERENCES Users(id_user) +); + +CREATE TABLE Commentary( + id_comment SERIAL PRIMARY KEY, + quote SERIAL NOT NULL, + users SERIAL NOT NULL, + dateC date NOT NULL, + comment text NOT NULL, + CONSTRAINT fk_quote FOREIGN KEY(quote) REFERENCES Quote(id_quote), + CONSTRAINT fk_user FOREIGN KEY(users) REFERENCES Users(id_user) +); + From 0c9c41c86251d037aae0636f89a2b1a1241530f6 Mon Sep 17 00:00:00 2001 From: "maxime.rocher" Date: Wed, 4 Dec 2024 20:54:11 +0100 Subject: [PATCH 04/20] encore un --- docker/Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 78223cf..4f9724a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,8 @@ +# Utiliser l'image officielle de PostgreSQL FROM postgres:17-alpine3.20 AS base -COPY init.sql /docker-entrypoint-initdb.d +# Copier le fichier init.sql depuis le dossier docker-entrypoint-initdb.d +COPY docker-entrypoint-initdb.d/init.sql /docker-entrypoint-initdb.d/ -EXPOSE 5432 \ No newline at end of file +# Exposer le port PostgreSQL par défaut +EXPOSE 5432 From 2c42f8f99d70927ca402215c28f16781489d798f Mon Sep 17 00:00:00 2001 From: "maxime.rocher" Date: Wed, 4 Dec 2024 20:56:35 +0100 Subject: [PATCH 05/20] encore un --- .dockerignore | 2 - .drone.yml | 22 +++-- docker-entrypoint-initdb.d/init.sql | 127 ---------------------------- docker/Dockerfile | 2 +- 4 files changed, 14 insertions(+), 139 deletions(-) delete mode 100644 .dockerignore delete mode 100644 docker-entrypoint-initdb.d/init.sql diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index ce1dafd..0000000 --- a/.dockerignore +++ /dev/null @@ -1,2 +0,0 @@ -scripts/ - diff --git a/.drone.yml b/.drone.yml index fd544c5..b8e499a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,26 +7,28 @@ trigger: - push steps: - - name: Build and Push - image: plugins/docker + # Étape 1 : Construire et pousser l'image Docker + - name: docker-build-and-push + image: hub.codefirst.iut.uca.fr/clement.freville2/plugins/kaniko:latest settings: dockerfile: docker/Dockerfile context: . registry: hub.codefirst.iut.uca.fr - mirror: https://proxy.iut.uca.fr:8443 - repo: hub.codefirst.iut.uca.fr/wikifantasy/wf-database + repo: hub.codefirst.iut.uca.fr/votreutilisateur/wf-database username: from_secret: SECRET_REGISTRY_USERNAME password: from_secret: SECRET_REGISTRY_PASSWORD + registry_mirrors: https://proxy.iut.uca.fr:8443 - - name: Deploy - image: hub.codefirst.iut.uca.fr/celeste.barbosa/codefirst-dockerproxy-clientdrone + # Étape 2 : Déployer le conteneur Docker + - name: deploy-container + image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest environment: - IMAGENAME: hub.codefirst.iut.uca.fr/wikifantasy/wf-database - CONTAINERNAME: WF_DATABASE + IMAGENAME: hub.codefirst.iut.uca.fr/votreutilisateur/wf-database:latest + CONTAINERNAME: wf-database COMMAND: create - OVERWRITE: false + OVERWRITE: true PRIVATE: true CODEFIRST_CLIENTDRONE_ENV_POSTGRES_PASSWORD: from_secret: POSTGRES_PASSWORD @@ -34,3 +36,5 @@ steps: from_secret: POSTGRES_DB CODEFIRST_CLIENTDRONE_ENV_POSTGRES_USER: from_secret: POSTGRES_USER + depends_on: + - docker-build-and-push diff --git a/docker-entrypoint-initdb.d/init.sql b/docker-entrypoint-initdb.d/init.sql deleted file mode 100644 index aef47bf..0000000 --- a/docker-entrypoint-initdb.d/init.sql +++ /dev/null @@ -1,127 +0,0 @@ --- Suppression des tables -DROP TABLE IF EXISTS Commentary; -DROP TABLE IF EXISTS Favorite; -DROP TABLE IF EXISTS DailyQuote; -DROP TABLE IF EXISTS Quote; -DROP TABLE IF EXISTS Caracter; -DROP TABLE IF EXISTS Source; -DROP TABLE IF EXISTS Record_quiz; -DROP TABLE IF EXISTS Quiz_Question; -DROP TABLE IF EXISTS Quiz; -DROP TABLE IF EXISTS Question; -DROP TABLE IF EXISTS Admin; -DROP TABLE IF EXISTS Users; -DROP TABLE IF EXISTS Image; - --- Création des tables - -CREATE TABLE Image( - id_img NUMERIC PRIMARY KEY, - imgPath varchar(100) NOT NULL UNIQUE -); - -CREATE TABLE Users( - id_user SERIAL PRIMARY KEY, - username varchar(50) NOT NULL, - email varchar(50) NOT NULL, - password varchar(100) NOT NULL, - img NUMERIC NOT NULL, - creation date NOT NULL, - CONSTRAINT unique_col UNIQUE (email), - CONSTRAINT fk_img FOREIGN KEY(img) REFERENCES Image(id_img) -); - -CREATE TABLE Admin( - users SERIAL PRIMARY KEY, - CONSTRAINT fk_user FOREIGN KEY(users) REFERENCES Users(id_user) -); - -CREATE TABLE Question( - id_question SERIAL PRIMARY KEY, - texte text NOT NULL UNIQUE, - answerA varchar(30) NOT NULL, - answerB varchar(30) NOT NULL, - answerC varchar(30) NOT NULL, - answerD varchar(30) NOT NULL, - cAnswer varchar(30) NOT NULL, - CONSTRAINT check_cAnswer CHECK (cAnswer = answerA OR cAnswer = answerB OR cAnswer = answerC OR cAnswer = answerD) -); - -CREATE TABLE Quiz( - id_quiz SERIAL PRIMARY KEY, - nb_quest numeric -); - -CREATE TABLE Quiz_Question( - quiz SERIAL NOT NULL, - question SERIAL NOT NULL, - PRIMARY KEY (quiz, question), - CONSTRAINT fk_quiz FOREIGN KEY(quiz) REFERENCES Quiz(id_quiz), - CONSTRAINT fk_question FOREIGN KEY(question) REFERENCES Question(id_question) -); - -CREATE TABLE Record_quiz( - users SERIAL NOT NULL, - quiz SERIAL NOT NULL, - nbPoint numeric DEFAULT '0', - timeQ numeric DEFAULT '0', - PRIMARY KEY (users, quiz), - CONSTRAINT fk_user FOREIGN KEY(users) REFERENCES Users(id_user), - CONSTRAINT fk_quiz FOREIGN KEY(quiz) REFERENCES Quiz(id_quiz), - CONSTRAINT err_nbPoint CHECK(nbPoint >= 0), - CONSTRAINT err_timeQ CHECK(timeQ >= 0) -); - -CREATE TABLE Source( - id_source SERIAL PRIMARY KEY, - title varchar(100) NOT NULL, - dateS numeric(4) NOT NULL -); - -CREATE TABLE Caracter( - id_caracter SERIAL PRIMARY KEY, - caracter varchar(100) NOT NULL, - id_img NUMERIC NOT NULL -); - -CREATE TABLE Quote( - id_quote SERIAL PRIMARY KEY, - content text NOT NULL, - likes numeric DEFAULT '0', - langue char(2) NOT NULL, - isValide boolean NOT NULL DEFAULT 'false', - reason varchar(100) NOT NULL, - id_caracter SERIAL NOT NULL, - id_source SERIAL NOT NULL, - id_user_verif SERIAL NOT NULL, - CONSTRAINT fk_caracter FOREIGN KEY(id_caracter) REFERENCES Caracter(id_caracter), - CONSTRAINT fk_source FOREIGN KEY(id_source) REFERENCES Source(id_source), - CONSTRAINT fk_userverif FOREIGN KEY(id_user_verif) REFERENCES Users(id_user), - CONSTRAINT err_nbLike CHECK (likes >= 0), - CONSTRAINT err_language CHECK (langue = 'fr' OR langue = 'en') -); - -CREATE TABLE DailyQuote( - citation_id INT PRIMARY KEY, - FOREIGN KEY (citation_id) REFERENCES Quote(id_quote) ON DELETE CASCADE -); - - -CREATE TABLE Favorite( - users SERIAL NOT NULL, - quote SERIAL NOT NULL, - PRIMARY KEY (users, quote), - CONSTRAINT fk_quote FOREIGN KEY(quote) REFERENCES Quote(id_quote), - CONSTRAINT fk_user FOREIGN KEY(users) REFERENCES Users(id_user) -); - -CREATE TABLE Commentary( - id_comment SERIAL PRIMARY KEY, - quote SERIAL NOT NULL, - users SERIAL NOT NULL, - dateC date NOT NULL, - comment text NOT NULL, - CONSTRAINT fk_quote FOREIGN KEY(quote) REFERENCES Quote(id_quote), - CONSTRAINT fk_user FOREIGN KEY(users) REFERENCES Users(id_user) -); - diff --git a/docker/Dockerfile b/docker/Dockerfile index 4f9724a..a035a57 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,7 +2,7 @@ FROM postgres:17-alpine3.20 AS base # Copier le fichier init.sql depuis le dossier docker-entrypoint-initdb.d -COPY docker-entrypoint-initdb.d/init.sql /docker-entrypoint-initdb.d/ +COPY scripts/init.sql /docker-entrypoint-initdb.d/ # Exposer le port PostgreSQL par défaut EXPOSE 5432 From b80976c1d4de589c7347e5862b5bf4767482a7da Mon Sep 17 00:00:00 2001 From: "maxime.rocher" Date: Wed, 4 Dec 2024 20:58:13 +0100 Subject: [PATCH 06/20] encore un --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index b8e499a..22497c5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,7 +14,7 @@ steps: dockerfile: docker/Dockerfile context: . registry: hub.codefirst.iut.uca.fr - repo: hub.codefirst.iut.uca.fr/votreutilisateur/wf-database + repo: hub.codefirst.iut.uca.fr/wikifantasy/wf-database username: from_secret: SECRET_REGISTRY_USERNAME password: @@ -25,7 +25,7 @@ steps: - name: deploy-container image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest environment: - IMAGENAME: hub.codefirst.iut.uca.fr/votreutilisateur/wf-database:latest + IMAGENAME: hub.codefirst.iut.uca.fr/wikifantasy/wf-database:latest CONTAINERNAME: wf-database COMMAND: create OVERWRITE: true From cb0f9c5fc0d700543eeba613a05abe26d37f4f0d Mon Sep 17 00:00:00 2001 From: "maxime.rocher" Date: Wed, 4 Dec 2024 21:01:25 +0100 Subject: [PATCH 07/20] encore un --- .drone.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index 22497c5..1847bf3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,9 +7,9 @@ trigger: - push steps: - # Étape 1 : Construire et pousser l'image Docker - - name: docker-build-and-push - image: hub.codefirst.iut.uca.fr/clement.freville2/plugins/kaniko:latest + # Étape 1 : Construire et pousser l'image Docker PostgreSQL + - name: build-and-push-database + image: plugins/docker settings: dockerfile: docker/Dockerfile context: . @@ -19,10 +19,9 @@ steps: from_secret: SECRET_REGISTRY_USERNAME password: from_secret: SECRET_REGISTRY_PASSWORD - registry_mirrors: https://proxy.iut.uca.fr:8443 - # Étape 2 : Déployer le conteneur Docker - - name: deploy-container + # Étape 2 : Déployer le conteneur PostgreSQL + - name: deploy-database image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest environment: IMAGENAME: hub.codefirst.iut.uca.fr/wikifantasy/wf-database:latest @@ -37,4 +36,4 @@ steps: CODEFIRST_CLIENTDRONE_ENV_POSTGRES_USER: from_secret: POSTGRES_USER depends_on: - - docker-build-and-push + - build-and-push-database From e38fb7ab568eb124abbe378e0fe273e9f7316f5c Mon Sep 17 00:00:00 2001 From: "maxime.rocher" Date: Wed, 4 Dec 2024 21:03:16 +0100 Subject: [PATCH 08/20] encore un --- .drone.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.drone.yml b/.drone.yml index 1847bf3..8fbb287 100644 --- a/.drone.yml +++ b/.drone.yml @@ -37,3 +37,8 @@ steps: from_secret: POSTGRES_USER depends_on: - build-and-push-database + + - name: debug-containers + image: docker:20.10 + commands: + - docker ps -a From 8d77f4eda65589391f983005e036b9a8a4c4bf31 Mon Sep 17 00:00:00 2001 From: "maxime.rocher" Date: Wed, 4 Dec 2024 21:05:14 +0100 Subject: [PATCH 09/20] encore un --- .drone.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 8fbb287..e31fe2f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -37,8 +37,11 @@ steps: from_secret: POSTGRES_USER depends_on: - build-and-push-database - - name: debug-containers image: docker:20.10 + environment: + - DOCKER_HOST=tcp://localhost:2375 commands: + - dockerd --host=tcp://0.0.0.0:2375 & + - sleep 5 # Attendre que Docker démarre - docker ps -a From e5f65eb52a137178b9f146452c6eb45a75526af7 Mon Sep 17 00:00:00 2001 From: "maxime.rocher" Date: Wed, 4 Dec 2024 21:06:10 +0100 Subject: [PATCH 10/20] encore un --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index e31fe2f..796e52d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -37,10 +37,11 @@ steps: from_secret: POSTGRES_USER depends_on: - build-and-push-database + - name: debug-containers image: docker:20.10 environment: - - DOCKER_HOST=tcp://localhost:2375 + DOCKER_HOST: tcp://localhost:2375 commands: - dockerd --host=tcp://0.0.0.0:2375 & - sleep 5 # Attendre que Docker démarre From 3704a3e4c33fcbb6c436a7fb03ea43a8105741b7 Mon Sep 17 00:00:00 2001 From: "maxime.rocher" Date: Wed, 4 Dec 2024 21:07:13 +0100 Subject: [PATCH 11/20] encore un --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 796e52d..85ab33e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -39,7 +39,8 @@ steps: - build-and-push-database - name: debug-containers - image: docker:20.10 + image: docker:20.10-dind + privileged: true environment: DOCKER_HOST: tcp://localhost:2375 commands: From 49ec5fcd5be974633cac30a417d2b74c6daed886 Mon Sep 17 00:00:00 2001 From: "maxime.rocher" Date: Wed, 4 Dec 2024 21:08:40 +0100 Subject: [PATCH 12/20] encore un --- .drone.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.drone.yml b/.drone.yml index 85ab33e..cd7e480 100644 --- a/.drone.yml +++ b/.drone.yml @@ -36,14 +36,4 @@ steps: CODEFIRST_CLIENTDRONE_ENV_POSTGRES_USER: from_secret: POSTGRES_USER depends_on: - - build-and-push-database - - - name: debug-containers - image: docker:20.10-dind - privileged: true - environment: - DOCKER_HOST: tcp://localhost:2375 - commands: - - dockerd --host=tcp://0.0.0.0:2375 & - - sleep 5 # Attendre que Docker démarre - - docker ps -a + - build-and-push-database \ No newline at end of file From ce56fddef8340d50a174509dc742d6828d98d6ac Mon Sep 17 00:00:00 2001 From: "maxime.rocher" Date: Wed, 4 Dec 2024 21:11:49 +0100 Subject: [PATCH 13/20] encore un --- .drone.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index cd7e480..ab16801 100644 --- a/.drone.yml +++ b/.drone.yml @@ -36,4 +36,12 @@ steps: CODEFIRST_CLIENTDRONE_ENV_POSTGRES_USER: from_secret: POSTGRES_USER depends_on: - - build-and-push-database \ No newline at end of file + - build-and-push-database + + + - name: list-containers + image: docker:20.10 + volumes: + - /var/run/docker.sock:/var/run/docker.sock + commands: + - docker ps -a From 92cd05f36aaf1194b062be0a377417f8ca94989f Mon Sep 17 00:00:00 2001 From: "maxime.rocher" Date: Wed, 4 Dec 2024 21:15:15 +0100 Subject: [PATCH 14/20] encore un --- .drone.yml | 35 ++++++----------------------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/.drone.yml b/.drone.yml index ab16801..a09628c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,33 +1,19 @@ kind: pipeline type: docker -name: Deploiement +name: Deploiement-Database trigger: event: - push steps: - # Étape 1 : Construire et pousser l'image Docker PostgreSQL - - name: build-and-push-database - image: plugins/docker - settings: - dockerfile: docker/Dockerfile - context: . - registry: hub.codefirst.iut.uca.fr - repo: hub.codefirst.iut.uca.fr/wikifantasy/wf-database - username: - from_secret: SECRET_REGISTRY_USERNAME - password: - from_secret: SECRET_REGISTRY_PASSWORD - - # Étape 2 : Déployer le conteneur PostgreSQL - - name: deploy-database + - name: deploy-container-postgresql image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest environment: - IMAGENAME: hub.codefirst.iut.uca.fr/wikifantasy/wf-database:latest - CONTAINERNAME: wf-database + IMAGENAME: postgres:17-alpine + CONTAINERNAME: postgres-db COMMAND: create - OVERWRITE: true + OVERWRITE: false # Change à `true` si tu veux remplacer le conteneur existant. PRIVATE: true CODEFIRST_CLIENTDRONE_ENV_POSTGRES_PASSWORD: from_secret: POSTGRES_PASSWORD @@ -35,13 +21,4 @@ steps: from_secret: POSTGRES_DB CODEFIRST_CLIENTDRONE_ENV_POSTGRES_USER: from_secret: POSTGRES_USER - depends_on: - - build-and-push-database - - - - name: list-containers - image: docker:20.10 - volumes: - - /var/run/docker.sock:/var/run/docker.sock - commands: - - docker ps -a + ADMINS: marocher8, maxime.rocher # Facultatif pour partager avec d'autres comptes. From a9c4a5538f5388fb32c79605003366bf8cb3c5fc Mon Sep 17 00:00:00 2001 From: "maxime.rocher" Date: Wed, 4 Dec 2024 21:17:31 +0100 Subject: [PATCH 15/20] encore un --- .drone.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.drone.yml b/.drone.yml index a09628c..5b290b9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,6 +12,7 @@ steps: environment: IMAGENAME: postgres:17-alpine CONTAINERNAME: postgres-db + OVERWRITE: true COMMAND: create OVERWRITE: false # Change à `true` si tu veux remplacer le conteneur existant. PRIVATE: true @@ -22,3 +23,9 @@ steps: CODEFIRST_CLIENTDRONE_ENV_POSTGRES_USER: from_secret: POSTGRES_USER ADMINS: marocher8, maxime.rocher # Facultatif pour partager avec d'autres comptes. + + - name: debug-deployment + image: alpine + commands: + - echo "Conteneur déployé avec le nom WikiFantasy-postgres-db" + - echo "Vérifie l'URL : https://codefirst.iut.uca.fr/containers/WikiFantasy-postgres-db" From 6a982cde44b654834f7e71be299530c8c96f06a7 Mon Sep 17 00:00:00 2001 From: "maxime.rocher" Date: Wed, 4 Dec 2024 21:17:54 +0100 Subject: [PATCH 16/20] encore un --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5b290b9..a540d7a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ steps: ADMINS: marocher8, maxime.rocher # Facultatif pour partager avec d'autres comptes. - name: debug-deployment - image: alpine - commands: - - echo "Conteneur déployé avec le nom WikiFantasy-postgres-db" - - echo "Vérifie l'URL : https://codefirst.iut.uca.fr/containers/WikiFantasy-postgres-db" + image: alpine + commands: + - echo "Conteneur déployé avec le nom WikiFantasy-postgres-db" + - echo "Vérifie l'URL : https://codefirst.iut.uca.fr/containers/WikiFantasy-postgres-db" From c5ffbc49fa441982b7fa94a02d269524020e0945 Mon Sep 17 00:00:00 2001 From: "maxime.rocher" Date: Wed, 4 Dec 2024 21:18:13 +0100 Subject: [PATCH 17/20] encore un --- .drone.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index a540d7a..8dfd70e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -22,10 +22,4 @@ steps: from_secret: POSTGRES_DB CODEFIRST_CLIENTDRONE_ENV_POSTGRES_USER: from_secret: POSTGRES_USER - ADMINS: marocher8, maxime.rocher # Facultatif pour partager avec d'autres comptes. - - - name: debug-deployment - image: alpine - commands: - - echo "Conteneur déployé avec le nom WikiFantasy-postgres-db" - - echo "Vérifie l'URL : https://codefirst.iut.uca.fr/containers/WikiFantasy-postgres-db" + ADMINS: marocher8, maxime.rocher # Facultatif pour partager avec d'autres comptes. \ No newline at end of file From 7d5c877312c17b0275d1634dfd40a78c3340d13c Mon Sep 17 00:00:00 2001 From: "maxime.rocher" Date: Wed, 4 Dec 2024 21:20:42 +0100 Subject: [PATCH 18/20] encore un --- .drone.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8dfd70e..6d45893 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ kind: pipeline type: docker -name: Deploiement-Database +name: Deploiement trigger: event: @@ -11,10 +11,9 @@ steps: image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest environment: IMAGENAME: postgres:17-alpine - CONTAINERNAME: postgres-db - OVERWRITE: true + CONTAINERNAME: wf-database COMMAND: create - OVERWRITE: false # Change à `true` si tu veux remplacer le conteneur existant. + OVERWRITE: false PRIVATE: true CODEFIRST_CLIENTDRONE_ENV_POSTGRES_PASSWORD: from_secret: POSTGRES_PASSWORD @@ -22,4 +21,3 @@ steps: from_secret: POSTGRES_DB CODEFIRST_CLIENTDRONE_ENV_POSTGRES_USER: from_secret: POSTGRES_USER - ADMINS: marocher8, maxime.rocher # Facultatif pour partager avec d'autres comptes. \ No newline at end of file From f5bd2a8ad3434ac85502ca407ce3478d5b9b3d28 Mon Sep 17 00:00:00 2001 From: "maxime.rocher" Date: Wed, 4 Dec 2024 21:24:13 +0100 Subject: [PATCH 19/20] encore un --- .drone.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.drone.yml b/.drone.yml index 6d45893..592e3a2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,3 +21,6 @@ steps: from_secret: POSTGRES_DB CODEFIRST_CLIENTDRONE_ENV_POSTGRES_USER: from_secret: POSTGRES_USER + CODEFIRST_CLIENTDRONE_ENV_TRAEFIK_LABELS: true + ADMINS: marocher8, maxime.rocher + From 672c08293945ca8dfc654e427ed645720210ec74 Mon Sep 17 00:00:00 2001 From: Kentin BRONGNIART Date: Thu, 5 Dec 2024 15:20:16 +0100 Subject: [PATCH 20/20] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'.drone.yml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 592e3a2..f3ce6f5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -22,5 +22,5 @@ steps: CODEFIRST_CLIENTDRONE_ENV_POSTGRES_USER: from_secret: POSTGRES_USER CODEFIRST_CLIENTDRONE_ENV_TRAEFIK_LABELS: true - ADMINS: marocher8, maxime.rocher + ADMINS: marocher8, maximerocher , kentinbrongniart