From 5c5b7cd7726aac735930cdac067c1a3803c95a7b Mon Sep 17 00:00:00 2001 From: Antoine PEREDERII Date: Tue, 26 Mar 2024 21:43:32 +0100 Subject: [PATCH 01/13] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index bc7fb2a6..4ef10c90 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ kind: pipeline type: docker -name: HeartWave +name: HeartTrack trigger: event: From ba40a2a7a7193fddb25a63b5378f283262259707 Mon Sep 17 00:00:00 2001 From: Antoine PEREDERII Date: Tue, 26 Mar 2024 21:46:09 +0100 Subject: [PATCH 02/13] Update 'Sources/config/Dockerfile' --- Sources/config/Dockerfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Sources/config/Dockerfile b/Sources/config/Dockerfile index 63ff3f5b..a2a49abe 100755 --- a/Sources/config/Dockerfile +++ b/Sources/config/Dockerfile @@ -10,11 +10,7 @@ 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 +RUN apk update && apk add --no-cache libcouchbase-dev && pecl install couchbase && docker-php-ext-enable couchbase # Copy configs COPY ./config/virtual-host.conf /etc/apache2/sites-available/000-default.conf From 8b4babf647053843df393f2c94723f5d7416cdf4 Mon Sep 17 00:00:00 2001 From: Antoine PEREDERII Date: Tue, 26 Mar 2024 21:56:52 +0100 Subject: [PATCH 03/13] Update 'Sources/config/Dockerfile' --- Sources/config/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Sources/config/Dockerfile b/Sources/config/Dockerfile index a2a49abe..885c084c 100755 --- a/Sources/config/Dockerfile +++ b/Sources/config/Dockerfile @@ -10,8 +10,6 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local RUN docker-php-ext-install pdo pdo_mysql -RUN apk update && apk add --no-cache 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 f9347f04670a2c01d5d410f26d01f26a3c4e9890 Mon Sep 17 00:00:00 2001 From: Antoine PEREDERII Date: Tue, 26 Mar 2024 22:01:23 +0100 Subject: [PATCH 04/13] Update 'Sources/config/Dockerfile' --- Sources/config/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Sources/config/Dockerfile b/Sources/config/Dockerfile index 885c084c..0a29f67e 100755 --- a/Sources/config/Dockerfile +++ b/Sources/config/Dockerfile @@ -10,6 +10,9 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local RUN docker-php-ext-install pdo pdo_mysql +# Installation de l'extension PHP ext-couchbase +RUN docker-php-ext-install couchbase + # Copy configs COPY ./config/virtual-host.conf /etc/apache2/sites-available/000-default.conf COPY ./config/httpd.conf /etc/apache2/httpd.conf From 455af64c2eb2ed0888f5861a7719f92b28aa4a9d Mon Sep 17 00:00:00 2001 From: Antoine PEREDERII Date: Tue, 26 Mar 2024 22:02:30 +0100 Subject: [PATCH 05/13] Update 'Sources/config/Dockerfile' --- Sources/config/Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Sources/config/Dockerfile b/Sources/config/Dockerfile index 0a29f67e..885c084c 100755 --- a/Sources/config/Dockerfile +++ b/Sources/config/Dockerfile @@ -10,9 +10,6 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local RUN docker-php-ext-install pdo pdo_mysql -# Installation de l'extension PHP ext-couchbase -RUN docker-php-ext-install couchbase - # Copy configs COPY ./config/virtual-host.conf /etc/apache2/sites-available/000-default.conf COPY ./config/httpd.conf /etc/apache2/httpd.conf From 8a522b7aca6de3f092a9b60cad091e03b02f16ec Mon Sep 17 00:00:00 2001 From: Antoine PEREDERII Date: Tue, 26 Mar 2024 22:04:50 +0100 Subject: [PATCH 06/13] Update 'Sources/config/Dockerfile' --- Sources/config/Dockerfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Sources/config/Dockerfile b/Sources/config/Dockerfile index 885c084c..df5d1f0b 100755 --- a/Sources/config/Dockerfile +++ b/Sources/config/Dockerfile @@ -10,6 +10,15 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local RUN docker-php-ext-install pdo pdo_mysql +# Installation des dépendances nécessaires pour compiler l'extension +RUN apt-get update && \ + apt-get install -y \ + libcouchbase-dev \ + build-essential + +# Téléchargement et installation de l'extension couchbase +RUN 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 820aecc0c34cd584116571b3b07dfad8fa6d60c7 Mon Sep 17 00:00:00 2001 From: Antoine PEREDERII Date: Tue, 26 Mar 2024 22:06:26 +0100 Subject: [PATCH 07/13] Update 'Sources/config/Dockerfile' --- Sources/config/Dockerfile | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Sources/config/Dockerfile b/Sources/config/Dockerfile index df5d1f0b..885c084c 100755 --- a/Sources/config/Dockerfile +++ b/Sources/config/Dockerfile @@ -10,15 +10,6 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local RUN docker-php-ext-install pdo pdo_mysql -# Installation des dépendances nécessaires pour compiler l'extension -RUN apt-get update && \ - apt-get install -y \ - libcouchbase-dev \ - build-essential - -# Téléchargement et installation de l'extension couchbase -RUN 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 ddeb80157428b039ace31956a0e0e628c9596a48 Mon Sep 17 00:00:00 2001 From: Antoine PEREDERII Date: Tue, 26 Mar 2024 22:09:53 +0100 Subject: [PATCH 08/13] Update 'Sources/config/Dockerfile' --- Sources/config/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Sources/config/Dockerfile b/Sources/config/Dockerfile index 885c084c..2983ddda 100755 --- a/Sources/config/Dockerfile +++ b/Sources/config/Dockerfile @@ -24,6 +24,8 @@ COPY . /app ENV VOLUME_PATH /app/public +RUN ls -la + RUN composer install EXPOSE 80 From 1752ee572c141bd0132cc9022ae4421ec64d1d31 Mon Sep 17 00:00:00 2001 From: Antoine PEREDERII Date: Tue, 26 Mar 2024 22:10:32 +0100 Subject: [PATCH 09/13] Update '.drone.yml' --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 4ef10c90..ce1acca3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,6 +6,7 @@ trigger: event: - push + steps: # Test ✔️ - name: test From 627907ee20f3c5dcb9432d5cf9fb307d20041827 Mon Sep 17 00:00:00 2001 From: Antoine PEREDERII Date: Tue, 26 Mar 2024 22:26:00 +0100 Subject: [PATCH 10/13] Update 'Sources/composer.json' --- Sources/composer.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Sources/composer.json b/Sources/composer.json index 5e1cc402..f0019f36 100755 --- a/Sources/composer.json +++ b/Sources/composer.json @@ -33,9 +33,7 @@ "altorouter/altorouter": "1.1.0", "vlucas/phpdotenv": "^5.5", "psr/container": "^2.0", - "adriangibbons/php-fit-file-analysis": "^3.2.0", - "ext-couchbase": "*", - "ext-pdo": "*" + "adriangibbons/php-fit-file-analysis": "^3.2.0" }, "config": { "process-timeout": 2000 From aa0b84f93ad35e3162c8c8e8ae55fa310a02abb9 Mon Sep 17 00:00:00 2001 From: Antoine PEREDERII Date: Tue, 26 Mar 2024 22:28:15 +0100 Subject: [PATCH 11/13] Update '.drone.yml' --- .drone.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index ce1acca3..4ef10c90 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,7 +6,6 @@ trigger: event: - push - steps: # Test ✔️ - name: test From 6f94f8507829ba529ae4672ad0e91201a9b3d5f6 Mon Sep 17 00:00:00 2001 From: Antoine PEREDERII Date: Tue, 26 Mar 2024 22:34:02 +0100 Subject: [PATCH 12/13] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 4ef10c90..def8fe5e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -72,7 +72,7 @@ steps: IMAGENAME: 'hub.codefirst.iut.uca.fr/david.d_almeida/web:latest' CONTAINERNAME: web COMMAND: create - OVERWRITE: true + #OVERWRITE: true ADMINS: davidd_almeida,kevinmonteiro,antoineperederii,paullevrault,antoinepinagot depends_on: - docker-build-and-push \ No newline at end of file From 490506fc2fd201187e62a1a903d4b2b372d43281 Mon Sep 17 00:00:00 2001 From: Antoine PEREDERII Date: Tue, 26 Mar 2024 22:35:48 +0100 Subject: [PATCH 13/13] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index def8fe5e..688cda56 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,7 +17,7 @@ steps: #- 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 + # - ./vendor/bin/phpunit tests # Sonar static code analisis deployment # TODO : use an image that already have unzip