diff --git a/docker/homologation/Dockerfile b/docker/homologation/Dockerfile index b5f6229..1793fc4 100644 --- a/docker/homologation/Dockerfile +++ b/docker/homologation/Dockerfile @@ -13,18 +13,12 @@ USER root WORKDIR /var/www/server - - - COPY ./docker/homologation/deploy/local.ini /usr/local/etc/php/conf.d/docker-fpm.ini COPY ./docker/homologation/deploy/conf.d/nginx.conf /etc/nginx/nginx.conf COPY ./docker/homologation/post_deploy.sh /var/www/post_deploy.sh - COPY ./version.jso* /var/html/version.json - - # setup composer and laravel RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer && \ git clone -b ${BRANCH} ${URL_TO_APPLICATION_GITHUB} /tmp/app && \ diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile index 057fdea..1da4d59 100644 --- a/docker/production/Dockerfile +++ b/docker/production/Dockerfile @@ -64,17 +64,14 @@ RUN apt-get update \ -COPY ./deploy/local.ini /usr/local/etc/php/conf.d/docker-fpm.ini -COPY ./deploy/conf.d/nginx.conf /etc/nginx/nginx.conf -COPY ./post_deploy.sh /var/www/post_deploy.sh +COPY ./docker/production/deploy/local.ini /usr/local/etc/php/conf.d/docker-fpm.ini +COPY ./docker/production/deploy/conf.d/nginx.conf /etc/nginx/nginx.conf +COPY ./docker/production/post_deploy.sh /var/www/post_deploy.sh # Development config files -COPY ./ssh /root/.ssh COPY ./version.jso* /var/html/version.json - - # setup composer and laravel RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer && \ git clone -b ${BRANCH} ${URL_TO_APPLICATION_GITHUB} /tmp/app && \