Skip to content

Commit

Permalink
docker file fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Mateusz Wojczal committed Sep 29, 2023
1 parent c23bc71 commit 3c3730a
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 13 deletions.
13 changes: 7 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,16 @@ RUN apt install -y debian-keyring debian-archive-keyring apt-transport-https \
RUN apt-get update && apt-get install caddy -y
RUN pecl install excimer
RUN cp docker/envs/.env.postgres.prod /var/www/html/.env \
# general supervisord settings
&& cp docker/conf/supervisor/supervisord.conf /etc/supervisor/supervisord.conf \
&& cp docker/conf/supervisor/services /etc/supervisor/custom.d \
# && cp docker/conf/supervisor/caddy.conf /etc/supervisor/custom.d/caddy.conf \
# && cp docker/conf/supervisor/scheduler.conf /etc/supervisor/custom.d/scheduler.conf \
# && cp docker/conf/supervisor/horizon.conf /etc/supervisor/custom.d/horizon.conf \
# supervisord services
&& cp -r docker/conf/supervisor/services/ /etc/supervisor/custom.d \
# caddy file for routing
&& cp docker/conf/caddy/Caddyfile /etc/caddy/Caddyfile \
# devilbox php.ini./ TODO this should be rather send to different custom file
&& cp docker/conf/php/xxx-devilbox-default-php.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini \
&& mkdir -p /usr/local/etc/php-fpm.d \
&& cp docker/conf/php/php-fpm-custom.conf /usr/local/etc/php-fpm.d/php-fpm-custom.conf/php-fpm-custom.conf
# overwrite some php-fpm settings
&& cp docker/conf/php/php-fpm-custom.conf /usr/local/etc/php-fpm.d/php-fpm-custom.conf
RUN composer self-update && composer install --no-scripts
RUN chown -R devilbox:devilbox /var/www/

Expand Down
15 changes: 8 additions & 7 deletions Dockerfile.develop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,17 @@ RUN apt install -y debian-archive-keyring apt-transport-https \
&& curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt' | tee /etc/apt/sources.list.d/caddy-stable.list
RUN apt-get update && apt-get install caddy -y
RUN pecl install excimer
RUN cp docker/envs/.env.postgres.develop /var/www/html/.env \
RUN cp docker/envs/.env.postgres.prod /var/www/html/.env \
# general supervisord settings
&& cp docker/conf/supervisor/supervisord.conf /etc/supervisor/supervisord.conf \
&& cp docker/conf/supervisor/services /etc/supervisor/custom.d \
# && cp docker/conf/supervisor/caddy.conf /etc/supervisor/custom.d/caddy.conf \
# && cp docker/conf/supervisor/scheduler.conf /etc/supervisor/custom.d/scheduler.conf \
# && cp docker/conf/supervisor/horizon.conf /etc/supervisor/custom.d/horizon.conf \
# supervisord services
&& cp -r docker/conf/supervisor/services/ /etc/supervisor/custom.d \
# caddy file for routing
&& cp docker/conf/caddy/Caddyfile /etc/caddy/Caddyfile \
# devilbox php.ini./ TODO this should be rather send to different custom file
&& cp docker/conf/php/xxx-devilbox-default-php.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini \
&& mkdir -p /usr/local/etc/php-fpm.d \
&& cp docker/conf/php/php-fpm-custom.conf /usr/local/etc/php-fpm.d/php-fpm-custom.conf/php-fpm-custom.conf
# overwrite some php-fpm settings
&& cp docker/conf/php/php-fpm-custom.conf /usr/local/etc/php-fpm.d/php-fpm-custom.conf
RUN composer self-update && composer install --no-scripts
RUN chown -R devilbox:devilbox /var/www/

Expand Down

0 comments on commit 3c3730a

Please sign in to comment.