modify networks: db, traefik, wireguard

This commit is contained in:
gregory hendrickson
2023-12-04 10:55:33 -08:00
parent 3d1ccb8c63
commit 2ee314b9d4
5 changed files with 30 additions and 11 deletions

View File

@@ -14,7 +14,7 @@ services:
- /opt/storagemysql-ghost:/var/lib/mysql # Mount MySQL data directory - /opt/storagemysql-ghost:/var/lib/mysql # Mount MySQL data directory
hostname: mysql-ghost # Set hostname for MySQL container hostname: mysql-ghost # Set hostname for MySQL container
networks: networks:
- traefik # Use external network named "traefik" - db # Use external network named "traefik"
# Ghost service # Ghost service
ghost: ghost:
@@ -43,4 +43,6 @@ services:
#This specifies external network traefik - docker network create traefik is required (managed outside of docker-compose) #This specifies external network traefik - docker network create traefik is required (managed outside of docker-compose)
networks: networks:
traefik: traefik:
external: true # Use external network named "traefik" external: true # Use external network named "traefik"
db:
external: true # Use external network named "db"

View File

@@ -54,11 +54,15 @@ RUN mkdir -p \
; ;
# Install additional dependencies # Install additional dependencies
RUN apt-get update && \ RUN set -ex; \
\
apt-get update && \
\
apt-get install -y build-essential wget cmake libx11-dev libopenblas-dev git apt-get install -y build-essential wget cmake libx11-dev libopenblas-dev git
# Install dlib # Install dlib
RUN git clone https://github.com/davisking/dlib.git && \ RUN set -ex; \
git clone https://github.com/davisking/dlib.git && \
cd dlib/dlib && \ cd dlib/dlib && \
mkdir build && \ mkdir build && \
cd build && \ cd build && \
@@ -67,7 +71,8 @@ RUN git clone https://github.com/davisking/dlib.git && \
make install make install
# Install pdlib # Install pdlib
RUN git clone https://github.com/goodspb/pdlib.git && \ RUN set -ex; \
git clone https://github.com/goodspb/pdlib.git && \
cd pdlib && \ cd pdlib && \
phpize && \ phpize && \
./configure --enable-debug && \ ./configure --enable-debug && \
@@ -75,9 +80,9 @@ RUN git clone https://github.com/goodspb/pdlib.git && \
make install make install
# Enable pdlib in PHP ###zzz ensures it will load last and override any other settings # Enable pdlib in PHP ###zzz ensures it will load last and override any other settings
RUN echo 'extension="pdlib.so"' >> /usr/local/etc/php/conf.d/zzz-php.ini RUN echo 'extension="pdlib.so"' >> /usr/local/etc/php/conf.d/zzz-php.ini \
# Explicitly Increase memory limit in PHP # Explicitly Increase memory limit in PHP
RUN echo 'memory_limit = 9600M' >> /usr/local/etc/php/conf.d/zzz-php.ini echo 'memory_limit = 9600M' >> /usr/local/etc/php/conf.d/zzz-php.ini
COPY supervisord.conf / COPY supervisord.conf /

View File

@@ -14,7 +14,7 @@ services:
volumes: volumes:
- /opt/storagemysql-nextcloud:/var/lib/mysql # Mount MySQL data directory - /opt/storagemysql-nextcloud:/var/lib/mysql # Mount MySQL data directory
networks: networks:
- traefik # Use external network named "traefik" - db # Use external network named "traefik"
# Nextcloud service # Nextcloud service
nextcloud: nextcloud:
@@ -71,5 +71,7 @@ services:
networks: networks:
traefik: traefik:
external: true # Use external network named "traefik" external: true # Use external network named "traefik"
db:
external: true # Use external network named "db"

View File

@@ -25,3 +25,8 @@ services:
sysctls: sysctls:
- net.ipv4.conf.all.src_valid_mark=1 - net.ipv4.conf.all.src_valid_mark=1
restart: unless-stopped restart: unless-stopped
networks:
wireguard:
external: true

View File

@@ -11,6 +11,7 @@ services:
MYSQL_DATABASE: ${MYSQL_DATABASE} MYSQL_DATABASE: ${MYSQL_DATABASE}
MYSQL_USER: ${MYSQL_USER} MYSQL_USER: ${MYSQL_USER}
MYSQL_PASSWORD: ${MYSQL_PASSWORD} MYSQL_PASSWORD: ${MYSQL_PASSWORD}
network: db
wordpress: wordpress:
depends_on: depends_on:
@@ -32,8 +33,12 @@ services:
- "traefik.http.services.wordpress.loadbalancer.server.port=80" - "traefik.http.services.wordpress.loadbalancer.server.port=80"
volumes: volumes:
- ${WORDPRESS_VOLUME}:/var/www/html - ${WORDPRESS_VOLUME}:/var/www/html
networks:
- traefik
networks: networks:
default: traefik:
external: external: true # Use external network named "traefik"
name: traefik db:
external: true # Use external network named "db"