Commit 6af2c2ef authored by Michael Iseard's avatar Michael Iseard
Browse files

Move uploads.ini changes to Dockerfile

parent 0130e6cf
......@@ -16,7 +16,6 @@ RUN apk add --no-cache \
libjpeg-turbo-utils \
gifsicle
# install the PHP extensions we need
RUN set -ex; \
\
......@@ -76,6 +75,15 @@ RUN { \
echo 'html_errors = Off'; \
} > /usr/local/etc/php/conf.d/error-logging.ini
# allow larger uploads
RUN { \
echo 'file_uploads = On'; \
echo 'memory_limit = 64M'; \
echo 'upload_max_filesize = 8M'; \
echo 'post_max_size = 8M'; \
echo 'max_execution_time = 600';\
} > /usr/local/etc/php/conf.d/uploads.ini
VOLUME /var/www/html
COPY docker-entrypoint.sh /entrypoint.sh
......
......@@ -6,23 +6,6 @@ networks:
services:
adminer:
image: adminer
container_name: ${CONTAINER_PREFIX}-adminer
ports:
- ${ADMINER_PORT:-8080}:8080
links:
- db
networks:
- web
- default
labels:
- traefik.enable=${ADMINER_TRAEFIK_ENABLE:-false}
- traefik.docker.network=web
- traefik.http.routers.${CONTAINER_PREFIX}-adminer.rule=Host(`${ADMINER_HOST}`)
- traefik.http.routers.${CONTAINER_PREFIX}-adminer.tls.certresolver=cloudflare
- traefik.http.routers.${CONTAINER_PREFIX}-adminer.entrypoints=web-secure
wordpress:
build:
context: ./build/wordpress
......@@ -36,7 +19,6 @@ services:
- db
volumes:
- ${WORDPRESS_DIR:-./wordpress}:/var/www/html/
- ${PHP_UPLOADS:-./php/uploads.ini}:/usr/local/etc/php/conf.d/uploads.ini
environment:
WORDPRESS_DB_NAME: ${MYSQL_DATABASE:-wordpress}
WORDPRESS_TABLE_PREFIX: ${WORDPRESS_TABLE_PREFIX:-wp_}
......@@ -89,6 +71,24 @@ services:
- MYSQL_DATABASE=${MYSQL_DATABASE:-wordpress}
restart: always
adminer:
image: adminer
container_name: ${CONTAINER_PREFIX}-adminer
ports:
- ${ADMINER_PORT:-8080}:8080
links:
- db
networks:
- web
- default
labels:
- traefik.enable=${ADMINER_TRAEFIK_ENABLE:-false}
- traefik.docker.network=web
- traefik.http.routers.${CONTAINER_PREFIX}-adminer.rule=Host(`${ADMINER_HOST}`)
- traefik.http.routers.${CONTAINER_PREFIX}-adminer.tls.certresolver=cloudflare
- traefik.http.routers.${CONTAINER_PREFIX}-adminer.entrypoints=web-secure
redis:
image: redis:alpine
container_name: ${CONTAINER_PREFIX}-redis
......
file_uploads = On
memory_limit = 64M
upload_max_filesize = 8M
post_max_size = 8M
max_execution_time = 600
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment