3 Commits

  1. 3
      config/dnsmasq/.gitignore
  2. 2
      config/dnsmasq/dnsmasq.conf.example
  3. 8
      docker-compose.yml.example
  4. 9
      dockerfiles/dnsmasq/Dockerfile
  5. 6
      dockerfiles/php-fpm/php81.Dockerfile
  6. 6
      dockerfiles/php-fpm/php82.Dockerfile
  7. 7
      dockerfiles/workspace/workspace81.Dockerfile
  8. 7
      dockerfiles/workspace/workspace82.Dockerfile

3
config/dnsmasq/.gitignore

@ -0,0 +1,3 @@
*
!.gitignore
!.example

2
config/dnsmasq/dnsmasq.conf → config/dnsmasq/dnsmasq.conf.example

@ -6,4 +6,4 @@ no-resolv
server=8.8.4.4 server=8.8.4.4
server=8.8.8.8 server=8.8.8.8
#explicitly define host-ip mappings #explicitly define host-ip mappings
address=/homerealestate.cz/144.76.56.24
address=/domain/ip

8
docker-compose.yml.example

@ -59,6 +59,14 @@ services:
extends: extends:
file: docker-compose.base.yml file: docker-compose.base.yml
service: inbucket service: inbucket
dnsmasq:
restart: always
build:
context: ./dockerfiles/dnsmasq
volumes:
- ./config/dnsmasq/dnsmasq.conf:/etc/dnsmasq.conf
cap_add:
- NET_ADMIN # @see https://man7.org/linux/man-pages/man7/capabilities.7.html
volumes: volumes:
database: database:

9
dockerfiles/dnsmasq/Dockerfile

@ -0,0 +1,9 @@
FROM alpine:latest
# @see https://github.com/mcmar/docker-dnsmasq
RUN apk --no-cache add dnsmasq
EXPOSE 53/tcp 53/udp 67/udp
CMD ["dnsmasq", "-k"]

6
dockerfiles/php-fpm/php81.Dockerfile

@ -50,3 +50,9 @@ RUN sed -i "s/^post_max_size = .*/post_max_size = $PHP_OPT_POST_MAX_SIZE/g" "$PH
ARG PHP_OPT_UPLOAD_MAX_FILESIZE=16M ARG PHP_OPT_UPLOAD_MAX_FILESIZE=16M
RUN sed -i "s/^upload_max_filesize = .*/upload_max_filesize = $PHP_OPT_UPLOAD_MAX_FILESIZE/g" "$PHP_INI_DIR/php.ini" RUN sed -i "s/^upload_max_filesize = .*/upload_max_filesize = $PHP_OPT_UPLOAD_MAX_FILESIZE/g" "$PHP_INI_DIR/php.ini"
###########################################################################
# Libreoffice:
###########################################################################
RUN apt-get update && apt-get install -y libreoffice-nogui --no-install-recommends && apt-get clean

6
dockerfiles/php-fpm/php82.Dockerfile

@ -50,3 +50,9 @@ RUN sed -i "s/^post_max_size = .*/post_max_size = $PHP_OPT_POST_MAX_SIZE/g" "$PH
ARG PHP_OPT_UPLOAD_MAX_FILESIZE=16M ARG PHP_OPT_UPLOAD_MAX_FILESIZE=16M
RUN sed -i "s/^upload_max_filesize = .*/upload_max_filesize = $PHP_OPT_UPLOAD_MAX_FILESIZE/g" "$PHP_INI_DIR/php.ini" RUN sed -i "s/^upload_max_filesize = .*/upload_max_filesize = $PHP_OPT_UPLOAD_MAX_FILESIZE/g" "$PHP_INI_DIR/php.ini"
###########################################################################
# Libreoffice:
###########################################################################
RUN apt-get update && apt-get install -y libreoffice-nogui --no-install-recommends && apt-get clean

7
dockerfiles/workspace/workspace81.Dockerfile

@ -106,3 +106,10 @@ USER root
COPY ./crontab /etc/cron.d COPY ./crontab /etc/cron.d
RUN chmod -R 644 /etc/cron.d RUN chmod -R 644 /etc/cron.d
###########################################################################
# Libreoffice:
###########################################################################
ARG DEBIAN_FRONTEND=noninteractive
RUN add-apt-repository ppa:libreoffice/ppa && apt update && apt install libreoffice-nogui -y --no-install-recommends && apt clean

7
dockerfiles/workspace/workspace82.Dockerfile

@ -106,3 +106,10 @@ USER root
COPY ./crontab /etc/cron.d COPY ./crontab /etc/cron.d
RUN chmod -R 644 /etc/cron.d RUN chmod -R 644 /etc/cron.d
###########################################################################
# Libreoffice:
###########################################################################
ARG DEBIAN_FRONTEND=noninteractive
RUN add-apt-repository ppa:libreoffice/ppa && apt update && apt install libreoffice-nogui -y --no-install-recommends && apt clean
Loading…
Cancel
Save