diff --git a/.drone.yml b/.drone.yml index 90cbb3b6..bc7fb2a6 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 @@ -39,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' @@ -76,19 +73,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 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