diff --git a/docker-compose-deploy.yml b/docker-compose-deploy.yml index 8f04f0f..0162f43 100644 --- a/docker-compose-deploy.yml +++ b/docker-compose-deploy.yml @@ -16,13 +16,11 @@ services: nginx: container_name: ogcore-nginx - build: - context: . - dockerfile: ./docker/Dockerfile-nginx depends_on: - php ports: - 8080:80 + - 8443:443 volumes: - ./public:/var/www/html/public:cached networks: @@ -31,9 +29,6 @@ services: php: container_name: ogcore-php - build: - context: . - dockerfile: ./docker/Dockerfile-jenkins-php depends_on: - database environment: diff --git a/docker/Dockerfile-jenkins-php b/docker/Dockerfile-jenkins-php index 8ed5266..8e00d8a 100644 --- a/docker/Dockerfile-jenkins-php +++ b/docker/Dockerfile-jenkins-php @@ -28,4 +28,3 @@ RUN apk del -f .build-deps COPY ./docker/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini COPY . /var/www/html -COPY provision.sh ./ diff --git a/provision.sh b/provision.sh deleted file mode 100755 index 20a7649..0000000 --- a/provision.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -composer install -php bin/console lexik:jwt:generate-keypair --overwrite -php bin/console doctrine:migrations:migrate --no-interaction -php bin/console doctrine:fixtures:load --no-interaction