From 9936e3f0bb2b23712b8d6c1c3ea27593a24e8fa0 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 11:10:18 +0100 Subject: [PATCH 01/70] Update 'Dockerfile' --- Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8ccd7dc..d8114f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,12 @@ -FROM node:17-alpine +FROM node:12.18.1 +ENV NODE_ENV=production WORKDIR /app -RUN npm install +COPY ["bob_party/package.json", "bob_party/package-lock.json*", "."] -COPY . . +RUN npm install --production -EXPOSE 3000 +COPY . . -CMD ["npm", "start"] \ No newline at end of file +CMD [ "node", "server.js" ] \ No newline at end of file From dac6849bd707cc6944c8ea5403c7eb07eb579a32 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 11:11:21 +0100 Subject: [PATCH 02/70] Update 'Dockerfile' --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d8114f8..1f42ee9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ENV NODE_ENV=production WORKDIR /app -COPY ["bob_party/package.json", "bob_party/package-lock.json*", "."] +COPY ["bob_party/package.json", "bob_party/package-lock.json*", "./"] RUN npm install --production From d95b847158dc294f92d461b552fc9ab16064ea1a Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 11:13:29 +0100 Subject: [PATCH 03/70] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 420bf01..58cb403 100644 --- a/.drone.yml +++ b/.drone.yml @@ -42,7 +42,7 @@ steps: dockerfile: Dockerfile context: . registry: hub.codefirst.iut.uca.fr - repo: hub.codefirst.iut.uca.fr/lilian.breton/BobParty + repo: hub.codefirst.iut.uca.fr/lilian.breton/bobparty username: from_secret: SECRET_REGISTRY_USERNAME password: From 337e6a5a3509b861645a01e872681a2101beeecc Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 11:13:50 +0100 Subject: [PATCH 04/70] Update '.drone.yml' --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 58cb403..880ecbd 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,7 +12,7 @@ steps: CONTAINERNAME: mysql COMMAND: create # OVERWRITE: false - PRIVATE: true + PRIVATE: false CODEFIRST_CLIENTDRONE_ENV_MYSQL_ROOT_PASSWORD: from_secret: MYSQL_ROOT_PASSWORD CODEFIRST_CLIENTDRONE_ENV_MYSQL_DATABASE: @@ -30,7 +30,7 @@ steps: IMAGENAME: reactnativecommunity/react-native-android:2.1 CONTAINERNAME: container_react COMMAND: create - PRIVATE: true + PRIVATE: false OVERWRITE: true From a4b518de3185306117996b43bef8b081468819d4 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 11:18:28 +0100 Subject: [PATCH 05/70] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 880ecbd..f864ee2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -35,7 +35,7 @@ steps: -# docker image build +# docker image build (at least I'm trying) - name: docker-build-and-push image: plugins/docker settings: From c474e6a185f6e88f371e7bf6f220bfb3d7857a03 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 11:24:54 +0100 Subject: [PATCH 06/70] Update '.drone.yml' --- .drone.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index f864ee2..d6e0ccb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -46,4 +46,13 @@ steps: username: from_secret: SECRET_REGISTRY_USERNAME password: - from_secret: SECRET_REGISTRY_PASSWORD \ No newline at end of file + from_secret: SECRET_REGISTRY_PASSWORD + +# container deployment +- name: deploy-bob_party-container + image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest + environment: + IMAGENAME: hub.codefirst.iut.uca.fr/lilian.breton/bobparty:latest + CONTAINERNAME: bob_party_container + COMMAND: create + OVERWRITE: true \ No newline at end of file From 4bc2d3efe5a42b3d813c2ad5610c0e4f0b99d270 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 11:26:32 +0100 Subject: [PATCH 07/70] Update '.drone.yml' --- .drone.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index d6e0ccb..0c8e8a6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -49,10 +49,10 @@ steps: from_secret: SECRET_REGISTRY_PASSWORD # container deployment -- name: deploy-bob_party-container - image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest - environment: - IMAGENAME: hub.codefirst.iut.uca.fr/lilian.breton/bobparty:latest - CONTAINERNAME: bob_party_container - COMMAND: create - OVERWRITE: true \ No newline at end of file + - name: deploy-bob_party-container + image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest + environment: + IMAGENAME: hub.codefirst.iut.uca.fr/lilian.breton/bobparty:latest + CONTAINERNAME: bob_party_container + COMMAND: create + OVERWRITE: true \ No newline at end of file From fbfcb0bd4f5c2704bfe524f5bb341be320a78eaf Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 11:29:47 +0100 Subject: [PATCH 08/70] Update 'Dockerfile' --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1f42ee9..42d3344 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM node:12.18.1 ENV NODE_ENV=production -WORKDIR /app +WORKDIR /bob_party COPY ["bob_party/package.json", "bob_party/package-lock.json*", "./"] From c747c9d55104d1cae77b9e05dc0db8eb6f85cef5 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 11:47:34 +0100 Subject: [PATCH 09/70] Update 'Dockerfile' --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 42d3344..8b02ea5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,4 +9,4 @@ RUN npm install --production COPY . . -CMD [ "node", "server.js" ] \ No newline at end of file +CMD [ "node", "bob_party/App.tsx" ] \ No newline at end of file From 553f46891b019a474e44c03e4c2cf5e4059e897f Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 11:51:12 +0100 Subject: [PATCH 10/70] Update 'Dockerfile' --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8b02ea5..3816342 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,4 +9,4 @@ RUN npm install --production COPY . . -CMD [ "node", "bob_party/App.tsx" ] \ No newline at end of file +CMD [ "npm", "start" ] \ No newline at end of file From d359644fb1a164f5887c6ad78be998b66caa276a Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 16:10:51 +0100 Subject: [PATCH 11/70] Update '.drone.yml' --- .drone.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 0c8e8a6..381af2f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -55,4 +55,14 @@ steps: IMAGENAME: hub.codefirst.iut.uca.fr/lilian.breton/bobparty:latest CONTAINERNAME: bob_party_container COMMAND: create - OVERWRITE: true \ No newline at end of file + OVERWRITE: true + + +# sonar setup + - name: sonar-setup + CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: sqp_8276da170682406ce11243607e0c60bf17391b11 + commands: + sonar-scanner \ + -Dsonar.projectKey=BOB-PARTY \ + -Dsonar.sources=. \ + -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar \ No newline at end of file From e443e1d4628ddb0268365f2a82bcc76522598a16 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 16:11:22 +0100 Subject: [PATCH 12/70] Update '.drone.yml' --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 381af2f..9892e3a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -62,7 +62,7 @@ steps: - name: sonar-setup CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: sqp_8276da170682406ce11243607e0c60bf17391b11 commands: - sonar-scanner \ - -Dsonar.projectKey=BOB-PARTY \ - -Dsonar.sources=. \ - -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar \ No newline at end of file + - sonar-scanner \ + -Dsonar.projectKey=BOB-PARTY \ + -Dsonar.sources=. \ + -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar \ No newline at end of file From 168154cb0eb9efba0c374f4da627b490a6227981 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 16:11:56 +0100 Subject: [PATCH 13/70] Update '.drone.yml' --- .drone.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9892e3a..bc4ebea 100644 --- a/.drone.yml +++ b/.drone.yml @@ -59,10 +59,8 @@ steps: # sonar setup - - name: sonar-setup - CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: sqp_8276da170682406ce11243607e0c60bf17391b11 - commands: - - sonar-scanner \ - -Dsonar.projectKey=BOB-PARTY \ - -Dsonar.sources=. \ - -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar \ No newline at end of file + CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: sqp_8276da170682406ce11243607e0c60bf17391b11 + - sonar-scanner \ + -Dsonar.projectKey=BOB-PARTY \ + -Dsonar.sources=. \ + -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar \ No newline at end of file From 66466ea4d5968effb3c42cdd4468aa91aac194a1 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 16:12:20 +0100 Subject: [PATCH 14/70] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index bc4ebea..d594f77 100644 --- a/.drone.yml +++ b/.drone.yml @@ -60,7 +60,7 @@ steps: # sonar setup CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: sqp_8276da170682406ce11243607e0c60bf17391b11 - - sonar-scanner \ + sonar-scanner \ -Dsonar.projectKey=BOB-PARTY \ -Dsonar.sources=. \ -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar \ No newline at end of file From cb214d1355dbd1a965e6d75ec02ca2828b948fc7 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 16:12:45 +0100 Subject: [PATCH 15/70] Update '.drone.yml' --- .drone.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index d594f77..3d6eb21 100644 --- a/.drone.yml +++ b/.drone.yml @@ -59,8 +59,8 @@ steps: # sonar setup - CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: sqp_8276da170682406ce11243607e0c60bf17391b11 - sonar-scanner \ - -Dsonar.projectKey=BOB-PARTY \ - -Dsonar.sources=. \ - -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar \ No newline at end of file +CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: sqp_8276da170682406ce11243607e0c60bf17391b11 + sonar-scanner \ + -Dsonar.projectKey=BOB-PARTY \ + -Dsonar.sources=. \ + -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar \ No newline at end of file From abd72dcd7e0c97d270851d9dd074bbfa5fe400d4 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 16:16:27 +0100 Subject: [PATCH 16/70] Update 'Dockerfile' --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3816342..d84049c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,4 +9,4 @@ RUN npm install --production COPY . . -CMD [ "npm", "start" ] \ No newline at end of file +CMD [ "npm", "run", "web" ] \ No newline at end of file From 212467afe96e970e4148ac1314f5131a1c430d2c Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 16:20:31 +0100 Subject: [PATCH 17/70] Update '.drone.yml' --- .drone.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3d6eb21..e9f18b5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -59,8 +59,10 @@ steps: # sonar setup -CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: sqp_8276da170682406ce11243607e0c60bf17391b11 - sonar-scanner \ - -Dsonar.projectKey=BOB-PARTY \ - -Dsonar.sources=. \ - -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar \ No newline at end of file + - name: sonar + CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: sqp_8276da170682406ce11243607e0c60bf17391b11 + commands: + - sonar-scanner \ + -Dsonar.projectKey=BOB-PARTY \ + -Dsonar.sources=. \ + -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar \ No newline at end of file From 3cece09956b6770b9e620f5298cdad91c4a0c481 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 16:22:59 +0100 Subject: [PATCH 18/70] Update '.drone.yml' --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index e9f18b5..4c60e1f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -61,6 +61,7 @@ steps: # sonar setup - name: sonar CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: sqp_8276da170682406ce11243607e0c60bf17391b11 + image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-sonar:latest commands: - sonar-scanner \ -Dsonar.projectKey=BOB-PARTY \ From eb5e4b2def4d445b55f8539b49161d3b65a86017 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 16:25:48 +0100 Subject: [PATCH 19/70] Update '.drone.yml' --- .drone.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4c60e1f..5dedf0b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -58,12 +58,8 @@ steps: OVERWRITE: true -# sonar setup - - name: sonar - CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: sqp_8276da170682406ce11243607e0c60bf17391b11 - image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-sonar:latest - commands: - - sonar-scanner \ - -Dsonar.projectKey=BOB-PARTY \ - -Dsonar.sources=. \ - -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar \ No newline at end of file + CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: sqp_8276da170682406ce11243607e0c60bf17391b11 + sonar-scanner \ + -Dsonar.projectKey=BOB-PARTY \ + -Dsonar.sources=. \ + -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar \ No newline at end of file From b63b2c8a6c5d4b6d4c89394e4ebbcb9bb8037f88 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 16:26:08 +0100 Subject: [PATCH 20/70] Update '.drone.yml' --- .drone.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5dedf0b..1f236ed 100644 --- a/.drone.yml +++ b/.drone.yml @@ -58,8 +58,8 @@ steps: OVERWRITE: true - CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: sqp_8276da170682406ce11243607e0c60bf17391b11 - sonar-scanner \ - -Dsonar.projectKey=BOB-PARTY \ - -Dsonar.sources=. \ - -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar \ No newline at end of file +CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: sqp_8276da170682406ce11243607e0c60bf17391b11 +sonar-scanner \ +-Dsonar.projectKey=BOB-PARTY \ +-Dsonar.sources=. \ +-Dsonar.host.url=https://codefirst.iut.uca.fr/sonar \ No newline at end of file From 6fe7590724ce151639d5f2ac25ad6920c9919ada Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 16:26:31 +0100 Subject: [PATCH 21/70] Update '.drone.yml' --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1f236ed..069af90 100644 --- a/.drone.yml +++ b/.drone.yml @@ -59,7 +59,7 @@ steps: CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: sqp_8276da170682406ce11243607e0c60bf17391b11 -sonar-scanner \ --Dsonar.projectKey=BOB-PARTY \ --Dsonar.sources=. \ --Dsonar.host.url=https://codefirst.iut.uca.fr/sonar \ No newline at end of file + sonar-scanner \ + -Dsonar.projectKey=BOB-PARTY \ + -Dsonar.sources=. \ + -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar \ No newline at end of file From 23fe5f00fa479d294f76e01a8ca504f97f7350ce Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 16:27:47 +0100 Subject: [PATCH 22/70] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 069af90..d310228 100644 --- a/.drone.yml +++ b/.drone.yml @@ -58,7 +58,7 @@ steps: OVERWRITE: true -CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: sqp_8276da170682406ce11243607e0c60bf17391b11 +CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: sqp_8937a8c406e06dbd27c9bf869d444b251f5451a6 sonar-scanner \ -Dsonar.projectKey=BOB-PARTY \ -Dsonar.sources=. \ From a914e967106091ea047d00de63bb518728cf3c72 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 16:40:00 +0100 Subject: [PATCH 23/70] Update '.drone.yml' --- .drone.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index d310228..c6eab80 100644 --- a/.drone.yml +++ b/.drone.yml @@ -57,9 +57,8 @@ steps: COMMAND: create OVERWRITE: true - -CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: sqp_8937a8c406e06dbd27c9bf869d444b251f5451a6 - sonar-scanner \ - -Dsonar.projectKey=BOB-PARTY \ - -Dsonar.sources=. \ - -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar \ No newline at end of file + -name: sonar + CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: + from_secret: SONAR_TOKEN + commands: + - sonar-scanner -Dsonar.projectKey=BOB-PARTY -Dsonar.sources=. -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar \ No newline at end of file From f5f95773a78ffa005fef42721768b8751865c9ff Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 16:40:34 +0100 Subject: [PATCH 24/70] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index c6eab80..320437f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -57,7 +57,7 @@ steps: COMMAND: create OVERWRITE: true - -name: sonar + - name: sonar CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: from_secret: SONAR_TOKEN commands: From d5dcb74cdf4369138308d2f69f53676c90873377 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 16:42:04 +0100 Subject: [PATCH 25/70] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 320437f..2c3fcc6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -61,4 +61,4 @@ steps: CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: from_secret: SONAR_TOKEN commands: - - sonar-scanner -Dsonar.projectKey=BOB-PARTY -Dsonar.sources=. -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar \ No newline at end of file + - sonar-scanner -Dsonar.projectKey=BOB-PARTY -Dsonar.sources=. -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar [$SONAR_TOKEN] \ No newline at end of file From af10ca8737aff24a5f40b1d0a51b82055d62cb5b Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 16:46:18 +0100 Subject: [PATCH 26/70] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 2c3fcc6..44a6e4b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -61,4 +61,4 @@ steps: CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: from_secret: SONAR_TOKEN commands: - - sonar-scanner -Dsonar.projectKey=BOB-PARTY -Dsonar.sources=. -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar [$SONAR_TOKEN] \ No newline at end of file + - sonar-scanner -Dsonar.projectKey=BOB-PARTY -Dsonar.sources=. -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar -Dsonar.login=$[SONAR_TOKEN] \ No newline at end of file From 35644ae5a20e137188573316eff9b82807148c2f Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 16:46:41 +0100 Subject: [PATCH 27/70] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 44a6e4b..5778026 100644 --- a/.drone.yml +++ b/.drone.yml @@ -60,5 +60,5 @@ steps: - name: sonar CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: from_secret: SONAR_TOKEN - commands: + COMMAND: - sonar-scanner -Dsonar.projectKey=BOB-PARTY -Dsonar.sources=. -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar -Dsonar.login=$[SONAR_TOKEN] \ No newline at end of file From d2617e21cdd2b825f8f5ccff6caf4ac602b33647 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 16:51:52 +0100 Subject: [PATCH 28/70] Update '.drone.yml' --- .drone.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 5778026..f1a6346 100644 --- a/.drone.yml +++ b/.drone.yml @@ -60,5 +60,4 @@ steps: - name: sonar CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: from_secret: SONAR_TOKEN - COMMAND: - sonar-scanner -Dsonar.projectKey=BOB-PARTY -Dsonar.sources=. -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar -Dsonar.login=$[SONAR_TOKEN] \ No newline at end of file From 78c2ccbb2ccb63ff68ea7c8b0ff17f1d76492d3e Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 16:52:12 +0100 Subject: [PATCH 29/70] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index f1a6346..4832fd7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -60,4 +60,4 @@ steps: - name: sonar CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: from_secret: SONAR_TOKEN - - sonar-scanner -Dsonar.projectKey=BOB-PARTY -Dsonar.sources=. -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar -Dsonar.login=$[SONAR_TOKEN] \ No newline at end of file + sonar-scanner -Dsonar.projectKey=BOB-PARTY -Dsonar.sources=. -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar -Dsonar.login=$[SONAR_TOKEN] \ No newline at end of file From 5ef6434ab51b16a0f3c33ed9272b2d4a47ad4cfe Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 17:06:19 +0100 Subject: [PATCH 30/70] Update '.drone.yml' --- .drone.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 4832fd7..4e06f7c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -60,4 +60,6 @@ steps: - name: sonar CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: from_secret: SONAR_TOKEN - sonar-scanner -Dsonar.projectKey=BOB-PARTY -Dsonar.sources=. -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar -Dsonar.login=$[SONAR_TOKEN] \ No newline at end of file + image: sonarqube:9.7.1-community + commands: + - sonar-scanner -Dsonar.projectKey=BOB-PARTY -Dsonar.sources=. -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar -Dsonar.login=$[SONAR_TOKEN] \ No newline at end of file From b2e612cc92433ed0c820ceaf7b3ddf700f42d01a Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 17:09:05 +0100 Subject: [PATCH 31/70] Update '.drone.yml' --- .drone.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 4e06f7c..7c0170b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -62,4 +62,8 @@ steps: from_secret: SONAR_TOKEN image: sonarqube:9.7.1-community commands: - - sonar-scanner -Dsonar.projectKey=BOB-PARTY -Dsonar.sources=. -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar -Dsonar.login=$[SONAR_TOKEN] \ No newline at end of file + - sonar-scanner \ + -Dsonar.projectKey=BOB-PARTY \ + -Dsonar.sources=. \ + -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar \ + -Dsonar.login=$[SONAR_TOKEN] \ No newline at end of file From 76defd39bd887d0d4b5fd8b34efffee15ff810b6 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 17:09:31 +0100 Subject: [PATCH 32/70] Update '.drone.yml' --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7c0170b..57e0a67 100644 --- a/.drone.yml +++ b/.drone.yml @@ -63,7 +63,7 @@ steps: image: sonarqube:9.7.1-community commands: - sonar-scanner \ - -Dsonar.projectKey=BOB-PARTY \ - -Dsonar.sources=. \ - -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar \ - -Dsonar.login=$[SONAR_TOKEN] \ No newline at end of file + -Dsonar.projectKey=BOB-PARTY \ + -Dsonar.sources=. \ + -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar \ + -Dsonar.login=$[SONAR_TOKEN] \ No newline at end of file From a33d8d82fd956dd404562717bc2b8f2e196da523 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 17:14:29 +0100 Subject: [PATCH 33/70] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 57e0a67..fefdc2f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -57,7 +57,7 @@ steps: COMMAND: create OVERWRITE: true - - name: sonar + - name: sonar-test CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: from_secret: SONAR_TOKEN image: sonarqube:9.7.1-community From 4f255c79422f54374306abe31842764b3c876c7d Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 22 Nov 2022 17:18:35 +0100 Subject: [PATCH 34/70] Update '.drone.yml' --- .drone.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index fefdc2f..9347f4c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -62,8 +62,4 @@ steps: from_secret: SONAR_TOKEN image: sonarqube:9.7.1-community commands: - - sonar-scanner \ - -Dsonar.projectKey=BOB-PARTY \ - -Dsonar.sources=. \ - -Dsonar.host.url=https://codefirst.iut.uca.fr/sonar \ - -Dsonar.login=$[SONAR_TOKEN] \ No newline at end of file + - sonar-scanner.bat -D"sonar.projectKey=BOB-PARTY" -D"sonar.sources=." -D"sonar.host.url=https://codefirst.iut.uca.fr/sonar" -D"sonar.login=$[SONAR_TOKEN]" \ No newline at end of file From b9c6345b1175cd1211655ecde5fd6b3e30c9a421 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 29 Nov 2022 13:48:54 +0100 Subject: [PATCH 35/70] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 9347f4c..77503a3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -57,7 +57,7 @@ steps: COMMAND: create OVERWRITE: true - - name: sonar-test + - name: make-sonar-test CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: from_secret: SONAR_TOKEN image: sonarqube:9.7.1-community From 57d0a62b9a3a1caec4e493bed4dda79f53df7c81 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Wed, 30 Nov 2022 10:28:06 +0100 Subject: [PATCH 36/70] Update '.drone.yml' --- .drone.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 77503a3..20a51b5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -57,9 +57,9 @@ steps: COMMAND: create OVERWRITE: true - - name: make-sonar-test - CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: - from_secret: SONAR_TOKEN - image: sonarqube:9.7.1-community - commands: - - sonar-scanner.bat -D"sonar.projectKey=BOB-PARTY" -D"sonar.sources=." -D"sonar.host.url=https://codefirst.iut.uca.fr/sonar" -D"sonar.login=$[SONAR_TOKEN]" \ No newline at end of file + # - name: make-sonar-test + # CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: + # from_secret: SONAR_TOKEN + # image: sonarqube:9.7.1-community + # commands: + # - sonar-scanner.bat -D"sonar.projectKey=BOB-PARTY" -D"sonar.sources=." -D"sonar.host.url=https://codefirst.iut.uca.fr/sonar" -D"sonar.login=$[SONAR_TOKEN]" \ No newline at end of file From 7391b1c85ae988e797c7d5c76783e661d4c9bfe2 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 13:23:35 +0100 Subject: [PATCH 37/70] Update '.drone.yml' --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index 20a51b5..9c039a6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,6 +21,8 @@ steps: from_secret: MYSQL_USER CODEFIRST_CLIENTDRONE_ENV_MYSQL_PASSWORD: from_secret: MYSQL_PASSWORD + ports: + - "${MYSQL_PORT}:3306" # Creation of a hosting docker for our application From 606f081551aa61d52afe8bab6ceafd46d3d8726f Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 13:25:18 +0100 Subject: [PATCH 38/70] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 9c039a6..8fb4362 100644 --- a/.drone.yml +++ b/.drone.yml @@ -22,7 +22,7 @@ steps: CODEFIRST_CLIENTDRONE_ENV_MYSQL_PASSWORD: from_secret: MYSQL_PASSWORD ports: - - "${MYSQL_PORT}:3306" + - 3306 # Creation of a hosting docker for our application From 5ef9ffaf957653644bf12b50e36cf030ebaffad0 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 13:25:41 +0100 Subject: [PATCH 39/70] Update '.drone.yml' --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8fb4362..b21b464 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,8 +21,8 @@ steps: from_secret: MYSQL_USER CODEFIRST_CLIENTDRONE_ENV_MYSQL_PASSWORD: from_secret: MYSQL_PASSWORD - ports: - - 3306 + ports: + - 3306 # Creation of a hosting docker for our application From c4457330c399b29948af0554f8b86e7c8c640ee2 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 13:26:48 +0100 Subject: [PATCH 40/70] Update '.drone.yml' --- .drone.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index b21b464..3ae5774 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,8 +21,7 @@ steps: from_secret: MYSQL_USER CODEFIRST_CLIENTDRONE_ENV_MYSQL_PASSWORD: from_secret: MYSQL_PASSWORD - ports: - - 3306 + ports: 3306 # Creation of a hosting docker for our application From d816e05a63618bebd8d79f9ea80a738f66bc41d3 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 13:27:01 +0100 Subject: [PATCH 41/70] Update '.drone.yml' --- .drone.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 3ae5774..20a51b5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,7 +21,6 @@ steps: from_secret: MYSQL_USER CODEFIRST_CLIENTDRONE_ENV_MYSQL_PASSWORD: from_secret: MYSQL_PASSWORD - ports: 3306 # Creation of a hosting docker for our application From 72a778df592ba260ca68282844b029293ac9fc0c Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 13:33:36 +0100 Subject: [PATCH 42/70] Update '.drone.yml' --- .drone.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index 20a51b5..1b55c49 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,18 +23,6 @@ steps: from_secret: MYSQL_PASSWORD -# Creation of a hosting docker for our application - - name: deploy-container - image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest - environment: - IMAGENAME: reactnativecommunity/react-native-android:2.1 - CONTAINERNAME: container_react - COMMAND: create - PRIVATE: false - OVERWRITE: true - - - # docker image build (at least I'm trying) - name: docker-build-and-push image: plugins/docker From 1d55354dd480d0b5cce12278c00fcfac27f7b9f8 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 13:35:51 +0100 Subject: [PATCH 43/70] Update '.drone.yml' --- .drone.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1b55c49..1943560 100644 --- a/.drone.yml +++ b/.drone.yml @@ -43,11 +43,4 @@ steps: IMAGENAME: hub.codefirst.iut.uca.fr/lilian.breton/bobparty:latest CONTAINERNAME: bob_party_container COMMAND: create - OVERWRITE: true - - # - name: make-sonar-test - # CODEFIRST_CLIENTDRONE_ENV_SONAR_TOKEN: - # from_secret: SONAR_TOKEN - # image: sonarqube:9.7.1-community - # commands: - # - sonar-scanner.bat -D"sonar.projectKey=BOB-PARTY" -D"sonar.sources=." -D"sonar.host.url=https://codefirst.iut.uca.fr/sonar" -D"sonar.login=$[SONAR_TOKEN]" \ No newline at end of file + OVERWRITE: true \ No newline at end of file From 8aa5649bf6704bcbfb3cd24beed93dcf39052818 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 13:39:07 +0100 Subject: [PATCH 44/70] Update '.drone.yml' --- .drone.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1943560..8358a43 100644 --- a/.drone.yml +++ b/.drone.yml @@ -37,10 +37,10 @@ steps: from_secret: SECRET_REGISTRY_PASSWORD # container deployment - - name: deploy-bob_party-container - image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest - environment: - IMAGENAME: hub.codefirst.iut.uca.fr/lilian.breton/bobparty:latest - CONTAINERNAME: bob_party_container - COMMAND: create - OVERWRITE: true \ No newline at end of file + # - name: deploy-bob_party-container + # image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest + # environment: + # IMAGENAME: hub.codefirst.iut.uca.fr/lilian.breton/bobparty:latest + # CONTAINERNAME: bob_party_container + # COMMAND: create + # OVERWRITE: true \ No newline at end of file From be8c8577c7ec9361c55f4cb20820e832b20e362f Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 13:41:44 +0100 Subject: [PATCH 45/70] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 8358a43..9366381 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,7 +12,7 @@ steps: CONTAINERNAME: mysql COMMAND: create # OVERWRITE: false - PRIVATE: false + PRIVATE: true CODEFIRST_CLIENTDRONE_ENV_MYSQL_ROOT_PASSWORD: from_secret: MYSQL_ROOT_PASSWORD CODEFIRST_CLIENTDRONE_ENV_MYSQL_DATABASE: From 97e1f7bbe0e11e9e4b5353f37a3ca86c7220ff0a Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 13:49:14 +0100 Subject: [PATCH 46/70] Update '.drone.yml' --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 9366381..867243a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,6 +21,7 @@ steps: from_secret: MYSQL_USER CODEFIRST_CLIENTDRONE_ENV_MYSQL_PASSWORD: from_secret: MYSQL_PASSWORD + EXPOSE 3306 # docker image build (at least I'm trying) From f1ace4177da779ce538bb138238401c689c78547 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 13:49:28 +0100 Subject: [PATCH 47/70] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 867243a..c3aa30f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,7 +21,7 @@ steps: from_secret: MYSQL_USER CODEFIRST_CLIENTDRONE_ENV_MYSQL_PASSWORD: from_secret: MYSQL_PASSWORD - EXPOSE 3306 + EXPOSE: 3306 # docker image build (at least I'm trying) From 9c5cd97cbb247d24371160c4a1a8243e7c4d4b30 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 13:52:26 +0100 Subject: [PATCH 48/70] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index c3aa30f..67d8839 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,7 +21,7 @@ steps: from_secret: MYSQL_USER CODEFIRST_CLIENTDRONE_ENV_MYSQL_PASSWORD: from_secret: MYSQL_PASSWORD - EXPOSE: 3306 + ports: "3306" # docker image build (at least I'm trying) From 1186168b86695b0e1e74f0ecf91df03e80656c4b Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 13:55:16 +0100 Subject: [PATCH 49/70] Update '.drone.yml' --- .drone.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 67d8839..9366381 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,7 +21,6 @@ steps: from_secret: MYSQL_USER CODEFIRST_CLIENTDRONE_ENV_MYSQL_PASSWORD: from_secret: MYSQL_PASSWORD - ports: "3306" # docker image build (at least I'm trying) From 6c84b667793473b155348edb8596deb8967a3e92 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 14:00:22 +0100 Subject: [PATCH 50/70] Update 'Dockerfile' --- Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d84049c..a45f208 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,4 +9,9 @@ RUN npm install --production COPY . . -CMD [ "npm", "run", "web" ] \ No newline at end of file +CMD [ "npm", "run", "web" ] + + +FROM mysql:8:0 + +COPY ./create.sql /docker-entrypoint-initdb.d/ \ No newline at end of file From 2edc1afc0a8b4e81c5d37979635d10147b94125e Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 14:07:58 +0100 Subject: [PATCH 51/70] Update 'Dockerfile' --- Dockerfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index a45f208..d84049c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,9 +9,4 @@ RUN npm install --production COPY . . -CMD [ "npm", "run", "web" ] - - -FROM mysql:8:0 - -COPY ./create.sql /docker-entrypoint-initdb.d/ \ No newline at end of file +CMD [ "npm", "run", "web" ] \ No newline at end of file From 288b4311738c1b50c7cd798de122668285cf612f Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 15:15:01 +0100 Subject: [PATCH 52/70] Update '.drone.yml' --- .drone.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9366381..1c656a9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,7 +6,7 @@ name: Dockers_Builder # Creation of the DB docker steps: - name: deploy-mysql-container - image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest + image: mysql environment: IMAGENAME: mysql:8.0 CONTAINERNAME: mysql @@ -24,17 +24,17 @@ steps: # docker image build (at least I'm trying) - - name: docker-build-and-push - image: plugins/docker - settings: - dockerfile: Dockerfile - context: . - registry: hub.codefirst.iut.uca.fr - repo: hub.codefirst.iut.uca.fr/lilian.breton/bobparty - username: - from_secret: SECRET_REGISTRY_USERNAME - password: - from_secret: SECRET_REGISTRY_PASSWORD + # - name: docker-build-and-push + # image: plugins/docker + # settings: + # dockerfile: Dockerfile + # context: . + # registry: hub.codefirst.iut.uca.fr + # repo: hub.codefirst.iut.uca.fr/lilian.breton/bobparty + # username: + # from_secret: SECRET_REGISTRY_USERNAME + # password: + # from_secret: SECRET_REGISTRY_PASSWORD # container deployment # - name: deploy-bob_party-container From 8f83a8c4489685fc4316391869b3958843fe5d26 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 15:17:01 +0100 Subject: [PATCH 53/70] Update '.drone.yml' --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 1c656a9..d6903c3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,6 +21,7 @@ steps: from_secret: MYSQL_USER CODEFIRST_CLIENTDRONE_ENV_MYSQL_PASSWORD: from_secret: MYSQL_PASSWORD + MYSQL_ALLOW_EMPTY_PASSWORD : true # docker image build (at least I'm trying) From f88c11c7a0c7c6681767ec5f40913fdedbbc3865 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 15:23:21 +0100 Subject: [PATCH 54/70] Update '.drone.yml' --- .drone.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index d6903c3..db80e06 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,15 +13,11 @@ steps: COMMAND: create # OVERWRITE: false PRIVATE: true - CODEFIRST_CLIENTDRONE_ENV_MYSQL_ROOT_PASSWORD: - from_secret: MYSQL_ROOT_PASSWORD - CODEFIRST_CLIENTDRONE_ENV_MYSQL_DATABASE: - from_secret: MYSQL_DATABASE - CODEFIRST_CLIENTDRONE_ENV_MYSQL_USER: - from_secret: MYSQL_USER - CODEFIRST_CLIENTDRONE_ENV_MYSQL_PASSWORD: - from_secret: MYSQL_PASSWORD - MYSQL_ALLOW_EMPTY_PASSWORD : true + args: + - MYSQL_DATABASE=${MYSQL_DATABASE} + - MYSQL_USER=${MYSQL_USER} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} # docker image build (at least I'm trying) From 8f8b07e5120b03f7a5dc80bafc8eeab05b6ff92f Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 15:25:02 +0100 Subject: [PATCH 55/70] Add '.env' --- .env | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 0000000..bbf5740 --- /dev/null +++ b/.env @@ -0,0 +1,4 @@ +MYSQL_DATABASE = db_BobParty; +MYSQL_USER = Bob; +MYSQL_PASSWORD = bobPassword; +MYSQL_ROOT_PASSWORD = rootPassword; \ No newline at end of file From 0403f6e804330b4ffcb4f7c78d52bc09f476544a Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 15:27:36 +0100 Subject: [PATCH 56/70] Update 'Dockerfile' --- Dockerfile | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index d84049c..535bb72 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,20 @@ -FROM node:12.18.1 -ENV NODE_ENV=production +FROM mysql:8.0 -WORKDIR /bob_party +RUN chown -R mysql:root /var/lib/mysql/ -COPY ["bob_party/package.json", "bob_party/package-lock.json*", "./"] +ARG MYSQL_DATABASE +ARG MYSQL_USER +ARG MYSQL_PASSWORD +ARG MYSQL_ROOT_PASSWORD -RUN npm install --production +ENV MYSQL_DATABASE=$MYSQL_DATABASE +ENV MYSQL_USER=$MYSQL_USER +ENV MYSQL_PASSWORD=$MYSQL_PASSWORD +ENV MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD -COPY . . +ADD data.sql create.sql -CMD [ "npm", "run", "web" ] \ No newline at end of file +RUN sed -i 's/MYSQL_DATABASE/'$MYSQL_DATABASE'/g' create.sql +RUN cp create.sql /docker-entrypoint-initdb.d + +EXPOSE 3306 \ No newline at end of file From 4eaa9cad30e88bca2ea417121dc74f482dc5d627 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 15:27:57 +0100 Subject: [PATCH 57/70] Update '.drone.yml' --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index db80e06..2729225 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,6 +18,8 @@ steps: - MYSQL_USER=${MYSQL_USER} - MYSQL_PASSWORD=${MYSQL_PASSWORD} - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + ports: + - "${MYSQL_PORT}:3306" # docker image build (at least I'm trying) From 3db81cebf30ce498c4c8240a8853c9f0bfbfd0b8 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 15:29:03 +0100 Subject: [PATCH 58/70] Update '.env' --- .env | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.env b/.env index bbf5740..90cc33e 100644 --- a/.env +++ b/.env @@ -1,4 +1,5 @@ -MYSQL_DATABASE = db_BobParty; -MYSQL_USER = Bob; -MYSQL_PASSWORD = bobPassword; -MYSQL_ROOT_PASSWORD = rootPassword; \ No newline at end of file +MYSQL_DATABASE = db_BobParty +MYSQL_USER = Bob +MYSQL_PASSWORD = bobPassword +MYSQL_ROOT_PASSWORD = rootPassword +MYSQL_PORT=3306 \ No newline at end of file From b661c30f5776bfef00bc84fdcd646f781e5a5ff9 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 15:30:31 +0100 Subject: [PATCH 59/70] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 2729225..b7ada9c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,7 +19,7 @@ steps: - MYSQL_PASSWORD=${MYSQL_PASSWORD} - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} ports: - - "${MYSQL_PORT}:3306" + - "$MYSQL_PORT:3306" # docker image build (at least I'm trying) From 0ff2d1939c743d1fa35ee8728adbd2093130f88d Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 15:31:03 +0100 Subject: [PATCH 60/70] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index b7ada9c..1258510 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,7 +19,7 @@ steps: - MYSQL_PASSWORD=${MYSQL_PASSWORD} - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} ports: - - "$MYSQL_PORT:3306" + - 3306 # docker image build (at least I'm trying) From b37516e3a333844f7a0a945e8abd470ab47502f7 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 15:31:33 +0100 Subject: [PATCH 61/70] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 1258510..a22e958 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,7 +14,7 @@ steps: # OVERWRITE: false PRIVATE: true args: - - MYSQL_DATABASE=${MYSQL_DATABASE} + - MYSQL_DATABASE=$MYSQL_DATABASE - MYSQL_USER=${MYSQL_USER} - MYSQL_PASSWORD=${MYSQL_PASSWORD} - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} From ba859bba7b57e3f4d7d1399b7c99eabe5e8f5ac8 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 15:37:33 +0100 Subject: [PATCH 62/70] Add 'docker-compose.yml' --- docker-compose.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..85c5120 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,13 @@ +version: '3.3' +services: +### MySQL Container + mysql: + build: + context: . + args: + - MYSQL_DATABASE=${MYSQL_DATABASE} + - MYSQL_USER=${MYSQL_USER} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + ports: + - "${MYSQL_PORT}:3306" From f2e66dc2d4669084675bdd92484a827db95d4791 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 15:42:02 +0100 Subject: [PATCH 63/70] Update 'docker-compose.yml' --- docker-compose.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 85c5120..10889b6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,13 +1,18 @@ version: '3.3' services: -### MySQL Container - mysql: - build: - context: . - args: + db: + image: mysql:5.7 + restart: always + environment: - MYSQL_DATABASE=${MYSQL_DATABASE} - MYSQL_USER=${MYSQL_USER} - MYSQL_PASSWORD=${MYSQL_PASSWORD} - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} ports: - - "${MYSQL_PORT}:3306" + - '3306:3306' + expose: + - '3306' + volumes: + - my-db:/var/lib/mysql +volumes: + my-db: From d23a19b3ca51a071989c952f484300b38b3d469e Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 15:42:16 +0100 Subject: [PATCH 64/70] Delete 'docker-compose.yml' --- docker-compose.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 10889b6..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,18 +0,0 @@ -version: '3.3' -services: - db: - image: mysql:5.7 - restart: always - environment: - - MYSQL_DATABASE=${MYSQL_DATABASE} - - MYSQL_USER=${MYSQL_USER} - - MYSQL_PASSWORD=${MYSQL_PASSWORD} - - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - ports: - - '3306:3306' - expose: - - '3306' - volumes: - - my-db:/var/lib/mysql -volumes: - my-db: From cee53421d3f5e00677a564cc1e04bcaf61112cd6 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 15:42:56 +0100 Subject: [PATCH 65/70] Update '.drone.yml' --- .drone.yml | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/.drone.yml b/.drone.yml index a22e958..9b180a4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,21 +5,25 @@ name: Dockers_Builder # Creation of the DB docker steps: - - name: deploy-mysql-container - image: mysql - environment: - IMAGENAME: mysql:8.0 - CONTAINERNAME: mysql - COMMAND: create - # OVERWRITE: false - PRIVATE: true - args: - - MYSQL_DATABASE=$MYSQL_DATABASE - - MYSQL_USER=${MYSQL_USER} - - MYSQL_PASSWORD=${MYSQL_PASSWORD} - - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - ports: - - 3306 + version: '3.3' + services: + db: + image: mysql:5.7 + restart: always + environment: + - MYSQL_DATABASE=${MYSQL_DATABASE} + - MYSQL_USER=${MYSQL_USER} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + ports: + - '3306:3306' + expose: + - '3306' + volumes: + - my-db:/var/lib/mysql + volumes: + my-db: + # docker image build (at least I'm trying) From 1b59b8fefeee067aa2e304b8ae4d0910cab4df6e Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 15:47:28 +0100 Subject: [PATCH 66/70] Update '.drone.yml' --- .drone.yml | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9b180a4..040b668 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,24 +5,23 @@ name: Dockers_Builder # Creation of the DB docker steps: - version: '3.3' - services: - db: - image: mysql:5.7 - restart: always - environment: - - MYSQL_DATABASE=${MYSQL_DATABASE} - - MYSQL_USER=${MYSQL_USER} - - MYSQL_PASSWORD=${MYSQL_PASSWORD} - - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - ports: - - '3306:3306' - expose: - - '3306' - volumes: - - my-db:/var/lib/mysql - volumes: - my-db: + # database container deployment + - name: deploy-container-mysql + image: mysql + environment: + IMAGENAME: mariadb:10 + CONTAINERNAME: mysql + COMMAND: create + # OVERWRITE: false + PRIVATE: true + CODEFIRST_CLIENTDRONE_ENV_ROOT_PASSWORD: + $ROOT_PASSWORD + CODEFIRST_CLIENTDRONE_ENV_DATABASE: + $MYSQL_DATABASE + CODEFIRST_CLIENTDRONE_ENV_USER: + ${MYSQL_USER} + CODEFIRST_CLIENTDRONE_ENV_PASSWORD: + ${MYSQL_ROOT_PASSWORD} From 4d59319f8d04c66977ee2f3abb3c5f8d714ebc0f Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 16:00:36 +0100 Subject: [PATCH 67/70] Update '.drone.yml' --- .drone.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index 040b668..42473bb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,14 +14,11 @@ steps: COMMAND: create # OVERWRITE: false PRIVATE: true - CODEFIRST_CLIENTDRONE_ENV_ROOT_PASSWORD: - $ROOT_PASSWORD - CODEFIRST_CLIENTDRONE_ENV_DATABASE: - $MYSQL_DATABASE - CODEFIRST_CLIENTDRONE_ENV_USER: - ${MYSQL_USER} - CODEFIRST_CLIENTDRONE_ENV_PASSWORD: - ${MYSQL_ROOT_PASSWORD} + environment: + ROOT_PASSWORD: $ROOT_PASSWORD + DATABASE: $MYSQL_DATABASE + USER: ${MYSQL_USER} + PASSWORD: ${MYSQL_ROOT_PASSWORD} From 952d487c75e80d82e0a1f59e1cff3d78b5585f51 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 16:01:17 +0100 Subject: [PATCH 68/70] Update '.drone.yml' --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 42473bb..7333407 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,10 +15,10 @@ steps: # OVERWRITE: false PRIVATE: true environment: - ROOT_PASSWORD: $ROOT_PASSWORD - DATABASE: $MYSQL_DATABASE - USER: ${MYSQL_USER} - PASSWORD: ${MYSQL_ROOT_PASSWORD} + MYSQL_ROOT_PASSWORD: $ROOT_PASSWORD + MYSQL_DATABASE: $MYSQL_DATABASE + MYSQL_USER: ${MYSQL_USER} + MYSQL_PASSWORD: ${MYSQL_ROOT_PASSWORD} From 2488c8fe3f4c19bd77fa71011958bdab8059ec13 Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 16:03:30 +0100 Subject: [PATCH 69/70] Update 'Dockerfile' --- Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 535bb72..636b106 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,4 @@ ENV MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD ADD data.sql create.sql RUN sed -i 's/MYSQL_DATABASE/'$MYSQL_DATABASE'/g' create.sql -RUN cp create.sql /docker-entrypoint-initdb.d - -EXPOSE 3306 \ No newline at end of file +RUN cp create.sql /docker-entrypoint-initdb.d \ No newline at end of file From c1217ecfbb5a7c2f77066a1ff83fad62702100ff Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Tue, 6 Dec 2022 16:36:39 +0100 Subject: [PATCH 70/70] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 7333407..9611b04 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,7 +13,7 @@ steps: CONTAINERNAME: mysql COMMAND: create # OVERWRITE: false - PRIVATE: true + PRIVATE: false environment: MYSQL_ROOT_PASSWORD: $ROOT_PASSWORD MYSQL_DATABASE: $MYSQL_DATABASE