fossilfranv/monica
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

feat: update templates (#19)

Browse Source
This commit is contained in:
Alexis Saettler 2020-05-21 15:22:29 +02:00 committed by GitHub
parent 6c88325e2d
commit 94858ec2e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 77 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.examples/maxsize/app/Dockerfile
View File

@ -1,5 +1,8 @@
FROM monica:fpm-alpine FROM monica:fpm-alpine
# Use the default production configuration
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
RUN set -ex;\ RUN set -ex;\
\ \
{ \ { \

2
.examples/maxsize/docker-compose.yml
View File

@ -3,6 +3,7 @@ version: "3.4"
services: services:
app: app:
build: ./app build: ./app
image: monica-app
depends_on: depends_on:
- db - db
env_file: .env env_file: .env
@ -15,6 +16,7 @@ services:
web: web:
build: ./web build: ./web
image: monica-web
restart: always restart: always
ports: ports:
- 8881:80 - 8881:80

4
.examples/nginx-proxy-self-signed-ssl/app/Dockerfile Normal file
View File

@ -0,0 +1,4 @@
FROM monica:fpm
# Use the default production configuration
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"

10
.examples/nginx-proxy-self-signed-ssl/docker-compose.yml
View File

@ -22,7 +22,8 @@ version: "3.4"
services: services:
app: app:
image: monica:fpm build: ./app
image: monica-app
env_file: .env env_file: .env
volumes: volumes:
- data:/var/www/html/storage - data:/var/www/html/storage
@ -47,7 +48,8 @@ services:
restart: always restart: always
cron: cron:
image: monica:fpm build: ./app
image: monica-app
env_file: .env env_file: .env
restart: always restart: always
volumes: volumes:
@ -58,7 +60,8 @@ services:
- redis - redis
queue: queue:
image: monica:fpm build: ./app
image: monica-app
env_file: .env env_file: .env
restart: always restart: always
volumes: volumes:
@ -70,6 +73,7 @@ services:
web: web:
build: ./web build: ./web
image: monica-web
restart: always restart: always
environment: environment:
- VIRTUAL_HOST=monica.local - VIRTUAL_HOST=monica.local

4
.examples/nginx-proxy/app/Dockerfile Normal file
View File

@ -0,0 +1,4 @@
FROM monica:fpm
# Use the default production configuration
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"

10
.examples/nginx-proxy/docker-compose.yml
View File

@ -21,7 +21,8 @@ version: "3.4"
services: services:
app: app:
image: monica:fpm build: ./app
image: monica-app
env_file: .env env_file: .env
volumes: volumes:
- data:/var/www/html/storage - data:/var/www/html/storage
@ -46,7 +47,8 @@ services:
restart: always restart: always
cron: cron:
image: monica:fpm build: ./app
image: monica-app
env_file: .env env_file: .env
restart: always restart: always
volumes: volumes:
@ -57,7 +59,8 @@ services:
- redis - redis
queue: queue:
image: monica:fpm build: ./app
image: monica-app
env_file: .env env_file: .env
restart: always restart: always
volumes: volumes:
@ -69,6 +72,7 @@ services:
web: web:
build: ./web build: ./web
image: monica-web
restart: always restart: always
environment: environment:
- VIRTUAL_HOST= - VIRTUAL_HOST=

4
.examples/supervisor/apache/app/Dockerfile
View File

@ -1,5 +1,8 @@
FROM monica:apache FROM monica:apache
# Use the default production configuration
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
# supervisord dependencies # supervisord dependencies
RUN set -ex; \ RUN set -ex; \
\ \
@ -10,4 +13,5 @@ RUN set -ex; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
COPY supervisord.conf /etc/supervisord.conf COPY supervisord.conf /etc/supervisord.conf
CMD ["supervisord", "-c", "/etc/supervisord.conf"] CMD ["supervisord", "-c", "/etc/supervisord.conf"]

1
.examples/supervisor/apache/docker-compose.yml
View File

@ -3,6 +3,7 @@ version: "3.4"
services: services:
app: app:
build: ./app build: ./app
image: monica-app
depends_on: depends_on:
- db - db
env_file: .env env_file: .env

4
.examples/supervisor/fpm-alpine/app/Dockerfile
View File

@ -1,5 +1,8 @@
FROM monica:fpm-alpine FROM monica:fpm-alpine
# Use the default production configuration
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
# supervisord dependencies # supervisord dependencies
RUN set -ex; \ RUN set -ex; \
\ \
@ -8,4 +11,5 @@ RUN set -ex; \
; ;
COPY supervisord.conf /etc/supervisord.conf COPY supervisord.conf /etc/supervisord.conf
CMD ["supervisord", "-c", "/etc/supervisord.conf"] CMD ["supervisord", "-c", "/etc/supervisord.conf"]

4
.examples/supervisor/fpm/app/Dockerfile
View File

@ -1,5 +1,8 @@
FROM monica:fpm FROM monica:fpm
# Use the default production configuration
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
# supervisord dependencies # supervisord dependencies
RUN set -ex; \ RUN set -ex; \
\ \
@ -10,4 +13,5 @@ RUN set -ex; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
COPY supervisord.conf /etc/supervisord.conf COPY supervisord.conf /etc/supervisord.conf
CMD ["supervisord", "-c", "/etc/supervisord.conf"] CMD ["supervisord", "-c", "/etc/supervisord.conf"]

15
.templates/Dockerfile-apache.template
View File

@ -1,5 +1,16 @@
RUN set -ex; \
\
a2enmod headers rewrite remoteip; \
{ \
echo RemoteIPHeader X-Real-IP; \
echo RemoteIPTrustedProxy 10.0.0.0/8; \
echo RemoteIPTrustedProxy 172.16.0.0/12; \
echo RemoteIPTrustedProxy 192.168.0.0/16; \
} > $APACHE_CONFDIR/conf-available/remoteip.conf; \
a2enconf remoteip
ENV APACHE_DOCUMENT_ROOT /var/www/html/public ENV APACHE_DOCUMENT_ROOT /var/www/html/public
RUN set -ex; \ RUN set -ex; \
\ \
sed -ri -e "s!/var/www/html!${APACHE_DOCUMENT_ROOT}!g" /etc/apache2/sites-available/*.conf; \ sed -ri -e "s!/var/www/html!${APACHE_DOCUMENT_ROOT}!g" $APACHE_CONFDIR/sites-available/*.conf; \
sed -ri -e "s!/var/www/!${APACHE_DOCUMENT_ROOT}!g" /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf sed -ri -e "s!/var/www/!${APACHE_DOCUMENT_ROOT}!g" $APACHE_CONFDIR/apache2.conf $APACHE_CONFDIR/conf-available/*.conf

6
.templates/Dockerfile-install.template
View File

@ -4,11 +4,7 @@
\ \
GPGKEY='BDAB0D0D36A00466A2964E85DE15667131EA6018'; \ GPGKEY='BDAB0D0D36A00466A2964E85DE15667131EA6018'; \
export GNUPGHOME="$(mktemp -d)"; \ export GNUPGHOME="$(mktemp -d)"; \
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY" \ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY"; \
|| gpg --batch --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$GPGKEY" \
|| gpg --batch --keyserver keys.gnupg.net --recv-keys "$GPGKEY" \
|| gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \
|| gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \
gpg --batch --verify monica-${MONICA_VERSION}.tar.bz2.asc monica-${MONICA_VERSION}.tar.bz2; \ gpg --batch --verify monica-${MONICA_VERSION}.tar.bz2.asc monica-${MONICA_VERSION}.tar.bz2; \
\ \
tar -xf monica-${MONICA_VERSION}.tar.bz2 -C /var/www/html --strip-components=1; \ tar -xf monica-${MONICA_VERSION}.tar.bz2 -C /var/www/html --strip-components=1; \

7
Dockerfile-debian.template
View File

@ -73,12 +73,7 @@ RUN set -ex; \
| xargs -rt apt-mark manual; \ | xargs -rt apt-mark manual; \
\ \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
rm -rf /var/lib/apt/lists/*; \ rm -rf /var/lib/apt/lists/*
\
if command -v a2enmod; then \
a2enmod rewrite; \
fi
%%EXTRA_INSTALL%% %%EXTRA_INSTALL%%

28
apache/Dockerfile
View File

@ -83,12 +83,7 @@ RUN set -ex; \
| xargs -rt apt-mark manual; \ | xargs -rt apt-mark manual; \
\ \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
rm -rf /var/lib/apt/lists/*; \ rm -rf /var/lib/apt/lists/*
\
if command -v a2enmod; then \
a2enmod rewrite; \
fi
# Set crontab for schedules # Set crontab for schedules
RUN set -ex; \ RUN set -ex; \
@ -120,11 +115,22 @@ RUN set -ex; \
\ \
echo 'memory_limit=512M' > $PHP_INI_DIR/conf.d/memory-limit.ini echo 'memory_limit=512M' > $PHP_INI_DIR/conf.d/memory-limit.ini
RUN set -ex; \
\
a2enmod headers rewrite remoteip; \
{ \
echo RemoteIPHeader X-Real-IP; \
echo RemoteIPTrustedProxy 10.0.0.0/8; \
echo RemoteIPTrustedProxy 172.16.0.0/12; \
echo RemoteIPTrustedProxy 192.168.0.0/16; \
} > $APACHE_CONFDIR/conf-available/remoteip.conf; \
a2enconf remoteip
ENV APACHE_DOCUMENT_ROOT /var/www/html/public ENV APACHE_DOCUMENT_ROOT /var/www/html/public
RUN set -ex; \ RUN set -ex; \
\ \
sed -ri -e "s!/var/www/html!${APACHE_DOCUMENT_ROOT}!g" /etc/apache2/sites-available/*.conf; \ sed -ri -e "s!/var/www/html!${APACHE_DOCUMENT_ROOT}!g" $APACHE_CONFDIR/sites-available/*.conf; \
sed -ri -e "s!/var/www/!${APACHE_DOCUMENT_ROOT}!g" /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf sed -ri -e "s!/var/www/!${APACHE_DOCUMENT_ROOT}!g" $APACHE_CONFDIR/apache2.conf $APACHE_CONFDIR/conf-available/*.conf
WORKDIR /var/www/html WORKDIR /var/www/html
@ -144,11 +150,7 @@ RUN set -ex; \
\ \
GPGKEY='BDAB0D0D36A00466A2964E85DE15667131EA6018'; \ GPGKEY='BDAB0D0D36A00466A2964E85DE15667131EA6018'; \
export GNUPGHOME="$(mktemp -d)"; \ export GNUPGHOME="$(mktemp -d)"; \
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY" \ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY"; \
|| gpg --batch --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$GPGKEY" \
|| gpg --batch --keyserver keys.gnupg.net --recv-keys "$GPGKEY" \
|| gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \
|| gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \
gpg --batch --verify monica-${MONICA_VERSION}.tar.bz2.asc monica-${MONICA_VERSION}.tar.bz2; \ gpg --batch --verify monica-${MONICA_VERSION}.tar.bz2.asc monica-${MONICA_VERSION}.tar.bz2; \
\ \
tar -xf monica-${MONICA_VERSION}.tar.bz2 -C /var/www/html --strip-components=1; \ tar -xf monica-${MONICA_VERSION}.tar.bz2 -C /var/www/html --strip-components=1; \

6
fpm-alpine/Dockerfile
View File

@ -127,11 +127,7 @@ RUN set -ex; \
\ \
GPGKEY='BDAB0D0D36A00466A2964E85DE15667131EA6018'; \ GPGKEY='BDAB0D0D36A00466A2964E85DE15667131EA6018'; \
export GNUPGHOME="$(mktemp -d)"; \ export GNUPGHOME="$(mktemp -d)"; \
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY" \ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY"; \
|| gpg --batch --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$GPGKEY" \
|| gpg --batch --keyserver keys.gnupg.net --recv-keys "$GPGKEY" \
|| gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \
|| gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \
gpg --batch --verify monica-${MONICA_VERSION}.tar.bz2.asc monica-${MONICA_VERSION}.tar.bz2; \ gpg --batch --verify monica-${MONICA_VERSION}.tar.bz2.asc monica-${MONICA_VERSION}.tar.bz2; \
\ \
tar -xf monica-${MONICA_VERSION}.tar.bz2 -C /var/www/html --strip-components=1; \ tar -xf monica-${MONICA_VERSION}.tar.bz2 -C /var/www/html --strip-components=1; \

13
fpm/Dockerfile
View File

@ -83,12 +83,7 @@ RUN set -ex; \
| xargs -rt apt-mark manual; \ | xargs -rt apt-mark manual; \
\ \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
rm -rf /var/lib/apt/lists/*; \ rm -rf /var/lib/apt/lists/*
\
if command -v a2enmod; then \
a2enmod rewrite; \
fi
# Set crontab for schedules # Set crontab for schedules
RUN set -ex; \ RUN set -ex; \
@ -140,11 +135,7 @@ RUN set -ex; \
\ \
GPGKEY='BDAB0D0D36A00466A2964E85DE15667131EA6018'; \ GPGKEY='BDAB0D0D36A00466A2964E85DE15667131EA6018'; \
export GNUPGHOME="$(mktemp -d)"; \ export GNUPGHOME="$(mktemp -d)"; \
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY" \ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY"; \
|| gpg --batch --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$GPGKEY" \
|| gpg --batch --keyserver keys.gnupg.net --recv-keys "$GPGKEY" \
|| gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \
|| gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \
gpg --batch --verify monica-${MONICA_VERSION}.tar.bz2.asc monica-${MONICA_VERSION}.tar.bz2; \ gpg --batch --verify monica-${MONICA_VERSION}.tar.bz2.asc monica-${MONICA_VERSION}.tar.bz2; \
\ \
tar -xf monica-${MONICA_VERSION}.tar.bz2 -C /var/www/html --strip-components=1; \ tar -xf monica-${MONICA_VERSION}.tar.bz2 -C /var/www/html --strip-components=1; \