diff --git a/.drone.yml b/.drone.yml index bc7fb2a6..688cda56 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ kind: pipeline type: docker -name: HeartWave +name: HeartTrack trigger: event: @@ -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 @@ -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 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 diff --git a/Sources/config/Dockerfile b/Sources/config/Dockerfile index 63ff3f5b..2983ddda 100755 --- a/Sources/config/Dockerfile +++ b/Sources/config/Dockerfile @@ -10,12 +10,6 @@ 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 @@ -30,6 +24,8 @@ COPY . /app ENV VOLUME_PATH /app/public +RUN ls -la + RUN composer install EXPOSE 80