From 2772384e785e21294d98e08c47d9e97b9a55f773 Mon Sep 17 00:00:00 2001 From: David D'ALMEIDA Date: Tue, 26 Mar 2024 20:56:02 +0100 Subject: [PATCH 1/8] =?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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 90cbb3b6..7b889f33 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,9 +15,9 @@ steps: - rm -r vendor - rm composer.lock - apk update && \ - apk add --no-cache libcouchbase-dev && \ - pecl install couchbase && \ - docker-php-ext-enable couchbase + apk add --no-cache libcouchbase-dev && \ + pecl install couchbase && \ + docker-php-ext-enable couchbase # Installe les dépendances PHP si nécessaire - php composer.phar install --no-interaction - ./vendor/bin/phpunit tests From 3f16bfd35603c8d4eb12c845992148e5c4177909 Mon Sep 17 00:00:00 2001 From: Antoine PEREDERII Date: Tue, 26 Mar 2024 21:05:03 +0100 Subject: [PATCH 2/8] Update '.drone.yml' --- .drone.yml | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7b889f33..465b0768 100644 --- a/.drone.yml +++ b/.drone.yml @@ -76,19 +76,6 @@ steps: CONTAINERNAME: web COMMAND: create OVERWRITE: true - ADMINS: david.d_almeida + ADMINS: davidd_almeida,kevinmonteiro,antoineperederii,paullevrault,antoinepinagot depends_on: - - docker-build-and-push - - - name: notify - image: ruby:2.1 - when: - status: [ success ] - ref: - include: - - refs/tags/*-demo - commands: - - sh ./notifymail.sh - depends_on: [ docker-build-and-push ] - - + - docker-build-and-push \ No newline at end of file From 334d36381aeed0aa4125900ceae76aa69317b3ba Mon Sep 17 00:00:00 2001 From: Antoine PEREDERII Date: Tue, 26 Mar 2024 21:05:48 +0100 Subject: [PATCH 3/8] Update '.drone.yml' --- .drone.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 465b0768..bca4b7d9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,10 +14,7 @@ steps: - cd Sources - rm -r vendor - rm composer.lock - - apk update && \ - apk add --no-cache libcouchbase-dev && \ - pecl install couchbase && \ - docker-php-ext-enable couchbase + - apk update && apk add --no-cache libcouchbase-dev && pecl install couchbase && docker-php-ext-enable couchbase # Installe les dépendances PHP si nécessaire - php composer.phar install --no-interaction - ./vendor/bin/phpunit tests From a11439e09047105f680414804c9f4eece0291446 Mon Sep 17 00:00:00 2001 From: Antoine PEREDERII Date: Tue, 26 Mar 2024 21:14:33 +0100 Subject: [PATCH 4/8] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index bca4b7d9..3379c2af 100644 --- a/.drone.yml +++ b/.drone.yml @@ -75,4 +75,4 @@ steps: OVERWRITE: true ADMINS: davidd_almeida,kevinmonteiro,antoineperederii,paullevrault,antoinepinagot depends_on: - - docker-build-and-push \ No newline at end of file + - docker-build-and-push From a5cced8301938a347d0e768454b9b2d9926274b2 Mon Sep 17 00:00:00 2001 From: Antoine PEREDERII Date: Tue, 26 Mar 2024 21:18:55 +0100 Subject: [PATCH 5/8] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 3379c2af..86baf36a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,7 +14,7 @@ steps: - cd Sources - rm -r vendor - rm composer.lock - - apk update && apk add --no-cache libcouchbase-dev && pecl install couchbase && docker-php-ext-enable couchbase + #- apk update && apk add --no-cache libcouchbase-dev && pecl install couchbase && docker-php-ext-enable couchbase # Installe les dépendances PHP si nécessaire - php composer.phar install --no-interaction - ./vendor/bin/phpunit tests From fb150e7785e1cb16585023aef429aef44c99cdf4 Mon Sep 17 00:00:00 2001 From: Antoine PEREDERII Date: Tue, 26 Mar 2024 21:22:11 +0100 Subject: [PATCH 6/8] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 86baf36a..b99af159 100644 --- a/.drone.yml +++ b/.drone.yml @@ -36,7 +36,7 @@ steps: - export SONAR_SCANNER_OPTS="-server" - cd Sources - sonar-scanner -D sonar.projectKey=HeartTrack -D sonar.host.url=https://codefirst.iut.uca.fr/sonar - depends_on: [ test ] + #depends_on: [ test ] # build image and push on the registry ✔️ - name: rewrite-urls image: 'busybox:latest' From 44468d8b5a30bc2dabd3d06623bfbbdcda7aad93 Mon Sep 17 00:00:00 2001 From: Antoine PEREDERII Date: Tue, 26 Mar 2024 21:25:40 +0100 Subject: [PATCH 7/8] Update 'Sources/config/Dockerfile' --- Sources/config/Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Sources/config/Dockerfile b/Sources/config/Dockerfile index 885c084c..63ff3f5b 100755 --- a/Sources/config/Dockerfile +++ b/Sources/config/Dockerfile @@ -10,6 +10,12 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local RUN docker-php-ext-install pdo pdo_mysql +RUN apt-get update && \ + apt-get install -y \ + libcouchbase-dev \ + && pecl install couchbase \ + && docker-php-ext-enable couchbase + # Copy configs COPY ./config/virtual-host.conf /etc/apache2/sites-available/000-default.conf COPY ./config/httpd.conf /etc/apache2/httpd.conf From 8b74458ec77b66c4b666a63a8b97c845d2d26c69 Mon Sep 17 00:00:00 2001 From: Antoine PEREDERII Date: Tue, 26 Mar 2024 21:30:04 +0100 Subject: [PATCH 8/8] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index b99af159..bc7fb2a6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -75,4 +75,4 @@ steps: OVERWRITE: true ADMINS: davidd_almeida,kevinmonteiro,antoineperederii,paullevrault,antoinepinagot depends_on: - - docker-build-and-push + - docker-build-and-push \ No newline at end of file