refactor: build only one frappe/erpnext image (#1032)
* ci: skip frappe builds * refactor: build only one frappe/erpnext image * fix: lint nginx entrypoint script * docs: update and organize docs * docs: fix lint errors * fix(custom): pass base64 encoded apps json * ci: update dependabot * docs: update contributing * docs: remove info about multi image setup * fix: initiate empty common_site_config.json default config has host keys set to localhost causes connection errors * docs: add details for pwd volumes * fix: symlink assets instead of copy * fix: nginx private files * ci: skip docker compose v2 install for ubuntu-latest * fix: organize layers * feat: allow remove git remote for custom image * docs: allow remove git remote for custom image * fix: remove duplicate --apps_path
This commit is contained in:
Revant Nandgaonkar
committed by
GitHub
GitHub
parent
f8e43a3114
commit
e6088af885
5
overrides/compose.custom-domain-ssl.yaml
Normal file
5
overrides/compose.custom-domain-ssl.yaml
Normal file
@@ -0,0 +1,5 @@
|
||||
services:
|
||||
custom-domain:
|
||||
labels:
|
||||
- traefik.http.routers.${ROUTER}.entrypoints=http,https
|
||||
- traefik.http.routers.${ROUTER}.tls.certresolver=le
|
||||
31
overrides/compose.custom-domain.yaml
Normal file
31
overrides/compose.custom-domain.yaml
Normal file
@@ -0,0 +1,31 @@
|
||||
version: "3.3"
|
||||
|
||||
services:
|
||||
custom-domain:
|
||||
image: caddy:2
|
||||
command:
|
||||
- caddy
|
||||
- reverse-proxy
|
||||
- --to
|
||||
- frontend:8080
|
||||
- --from
|
||||
- :2016
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.docker.network=traefik-public
|
||||
- traefik.http.services.${ROUTER?ROUTER not set}.loadbalancer.server.port=2016
|
||||
- traefik.http.routers.${ROUTER}.service=${ROUTER}
|
||||
- traefik.http.routers.${ROUTER}.entrypoints=http
|
||||
- traefik.http.routers.${ROUTER}.rule=Host(${SITES?SITES not set})
|
||||
- traefik.http.middlewares.${ROUTER}.headers.customrequestheaders.Host=${BASE_SITE?BASE_SITE not set}
|
||||
- traefik.http.routers.${ROUTER}.middlewares=${ROUTER}
|
||||
networks:
|
||||
- traefik-public
|
||||
- bench-network
|
||||
|
||||
networks:
|
||||
traefik-public:
|
||||
external: true
|
||||
bench-network:
|
||||
name: ${BENCH_NETWORK?BENCH_NETWORK not set}
|
||||
external: true
|
||||
@@ -1,27 +0,0 @@
|
||||
x-erpnext-backend-image: &erpnext_backend_image
|
||||
image: frappe/erpnext-worker:${ERPNEXT_VERSION:?No ERPNext version set}
|
||||
volumes:
|
||||
- sites:/home/frappe/frappe-bench/sites
|
||||
- assets:/home/frappe/frappe-bench/sites/assets:ro
|
||||
|
||||
services:
|
||||
configurator:
|
||||
<<: *erpnext_backend_image
|
||||
|
||||
backend:
|
||||
<<: *erpnext_backend_image
|
||||
|
||||
frontend:
|
||||
image: frappe/erpnext-nginx:${ERPNEXT_VERSION}
|
||||
|
||||
queue-short:
|
||||
<<: *erpnext_backend_image
|
||||
|
||||
queue-default:
|
||||
<<: *erpnext_backend_image
|
||||
|
||||
queue-long:
|
||||
<<: *erpnext_backend_image
|
||||
|
||||
scheduler:
|
||||
<<: *erpnext_backend_image
|
||||
27
overrides/compose.mariadb-shared.yaml
Normal file
27
overrides/compose.mariadb-shared.yaml
Normal file
@@ -0,0 +1,27 @@
|
||||
version: "3.3"
|
||||
|
||||
services:
|
||||
database:
|
||||
container_name: mariadb-database
|
||||
image: mariadb:10.6
|
||||
restart: unless-stopped
|
||||
healthcheck:
|
||||
test: mysqladmin ping -h localhost --password=${DB_PASSWORD:-changeit}
|
||||
interval: 1s
|
||||
retries: 15
|
||||
command:
|
||||
- --character-set-server=utf8mb4
|
||||
- --collation-server=utf8mb4_unicode_ci
|
||||
- --skip-character-set-client-handshake
|
||||
- --skip-innodb-read-only-compressed
|
||||
environment:
|
||||
MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:-changeit}
|
||||
volumes:
|
||||
- ${HOME}/data/mariadb:/var/lib/mysql
|
||||
networks:
|
||||
- mariadb-network
|
||||
|
||||
networks:
|
||||
mariadb-network:
|
||||
name: mariadb-network
|
||||
external: false
|
||||
14
overrides/compose.multi-bench-ssl.yaml
Normal file
14
overrides/compose.multi-bench-ssl.yaml
Normal file
@@ -0,0 +1,14 @@
|
||||
services:
|
||||
frontend:
|
||||
labels:
|
||||
# ${ROUTER}-http to use the middleware to redirect to https
|
||||
- traefik.http.routers.${ROUTER}-http.middlewares=https-redirect
|
||||
# ${ROUTER}-https the actual router using HTTPS
|
||||
# Uses the environment variable SITES
|
||||
- traefik.http.routers.${ROUTER}-https.rule=Host(${SITES?SITES not set})
|
||||
- traefik.http.routers.${ROUTER}-https.entrypoints=https
|
||||
- traefik.http.routers.${ROUTER}-https.tls=true
|
||||
# Use the service ${ROUTER} with the frontend
|
||||
- traefik.http.routers.${ROUTER}-https.service=${ROUTER}
|
||||
# Use the "le" (Let's Encrypt) resolver created below
|
||||
- traefik.http.routers.${ROUTER}-https.tls.certresolver=le
|
||||
53
overrides/compose.multi-bench.yaml
Normal file
53
overrides/compose.multi-bench.yaml
Normal file
@@ -0,0 +1,53 @@
|
||||
services:
|
||||
frontend:
|
||||
networks:
|
||||
- traefik-public
|
||||
- bench-network
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.docker.network=traefik-public
|
||||
- traefik.http.services.${ROUTER?ROUTER not set}.loadbalancer.server.port=8080
|
||||
- traefik.http.routers.${ROUTER}-http.service=${ROUTER}
|
||||
- traefik.http.routers.${ROUTER}-http.entrypoints=http
|
||||
- traefik.http.routers.${ROUTER}-http.rule=Host(${SITES?SITES not set})
|
||||
configurator:
|
||||
networks:
|
||||
- bench-network
|
||||
- mariadb-network
|
||||
backend:
|
||||
networks:
|
||||
- mariadb-network
|
||||
- bench-network
|
||||
websocket:
|
||||
networks:
|
||||
- bench-network
|
||||
- mariadb-network
|
||||
scheduler:
|
||||
networks:
|
||||
- bench-network
|
||||
- mariadb-network
|
||||
queue-default:
|
||||
networks:
|
||||
- bench-network
|
||||
- mariadb-network
|
||||
queue-short:
|
||||
networks:
|
||||
- bench-network
|
||||
- mariadb-network
|
||||
queue-long:
|
||||
networks:
|
||||
- bench-network
|
||||
- mariadb-network
|
||||
redis:
|
||||
networks:
|
||||
- bench-network
|
||||
- mariadb-network
|
||||
|
||||
networks:
|
||||
traefik-public:
|
||||
external: true
|
||||
mariadb-network:
|
||||
external: true
|
||||
bench-network:
|
||||
name: ${ROUTER}
|
||||
external: false
|
||||
@@ -1,16 +1,30 @@
|
||||
services:
|
||||
configurator:
|
||||
environment:
|
||||
REDIS_CACHE: redis:6379/0
|
||||
REDIS_QUEUE: redis:6379/1
|
||||
REDIS_SOCKETIO: redis:6379/2
|
||||
REDIS_CACHE: redis-cache:6379
|
||||
REDIS_QUEUE: redis-queue:6379
|
||||
REDIS_SOCKETIO: redis-socketio:6379
|
||||
depends_on:
|
||||
- redis
|
||||
- redis-cache
|
||||
- redis-queue
|
||||
- redis-socketio
|
||||
|
||||
redis:
|
||||
redis-cache:
|
||||
image: redis:6.2-alpine
|
||||
volumes:
|
||||
- redis-data:/data
|
||||
- redis-cache-data:/data
|
||||
|
||||
redis-queue:
|
||||
image: redis:6.2-alpine
|
||||
volumes:
|
||||
- redis-queue-data:/data
|
||||
|
||||
redis-socketio:
|
||||
image: redis:6.2-alpine
|
||||
volumes:
|
||||
- redis-socketio-data:/data
|
||||
|
||||
volumes:
|
||||
redis-data:
|
||||
redis-cache-data:
|
||||
redis-queue-data:
|
||||
redis-socketio-data:
|
||||
|
||||
45
overrides/compose.traefik-ssl.yaml
Normal file
45
overrides/compose.traefik-ssl.yaml
Normal file
@@ -0,0 +1,45 @@
|
||||
services:
|
||||
traefik:
|
||||
labels:
|
||||
# https-redirect middleware to redirect HTTP to HTTPS
|
||||
# It can be re-used by other stacks in other Docker Compose files
|
||||
- traefik.http.middlewares.https-redirect.redirectscheme.scheme=https
|
||||
- traefik.http.middlewares.https-redirect.redirectscheme.permanent=true
|
||||
# traefik-http to use the middleware to redirect to https
|
||||
- traefik.http.routers.traefik-public-http.middlewares=https-redirect
|
||||
# traefik-https the actual router using HTTPS
|
||||
# Uses the environment variable DOMAIN
|
||||
- traefik.http.routers.traefik-public-https.rule=Host(`${TRAEFIK_DOMAIN}`)
|
||||
- traefik.http.routers.traefik-public-https.entrypoints=https
|
||||
- traefik.http.routers.traefik-public-https.tls=true
|
||||
# Use the special Traefik service api@internal with the web UI/Dashboard
|
||||
- traefik.http.routers.traefik-public-https.service=api@internal
|
||||
# Use the "le" (Let's Encrypt) resolver created below
|
||||
- traefik.http.routers.traefik-public-https.tls.certresolver=le
|
||||
# Enable HTTP Basic auth, using the middleware created above
|
||||
- traefik.http.routers.traefik-public-https.middlewares=admin-auth
|
||||
command:
|
||||
# Enable Docker in Traefik, so that it reads labels from Docker services
|
||||
- --providers.docker=true
|
||||
# Do not expose all Docker services, only the ones explicitly exposed
|
||||
- --providers.docker.exposedbydefault=false
|
||||
# Create an entrypoint http listening on port 80
|
||||
- --entrypoints.http.address=:80
|
||||
# Create an entrypoint https listening on port 443
|
||||
- --entrypoints.https.address=:443
|
||||
# Create the certificate resolver le for Let's Encrypt, uses the environment variable EMAIL
|
||||
- --certificatesresolvers.le.acme.email=${EMAIL:?No EMAIL set}
|
||||
# Store the Let's Encrypt certificates in the mounted volume
|
||||
- --certificatesresolvers.le.acme.storage=/certificates/acme.json
|
||||
# Use the TLS Challenge for Let's Encrypt
|
||||
- --certificatesresolvers.le.acme.tlschallenge=true
|
||||
# Enable the access log, with HTTP requests
|
||||
- --accesslog
|
||||
# Enable the Traefik log, for configurations and errors
|
||||
- --log
|
||||
# Enable the Dashboard and API
|
||||
- --api
|
||||
ports:
|
||||
- 443:443
|
||||
volumes:
|
||||
- ${HOME}/data/traefik/certificates:/certificates
|
||||
46
overrides/compose.traefik.yaml
Normal file
46
overrides/compose.traefik.yaml
Normal file
@@ -0,0 +1,46 @@
|
||||
version: "3.3"
|
||||
|
||||
services:
|
||||
traefik:
|
||||
image: "traefik:v2.6"
|
||||
labels:
|
||||
# Enable Traefik for this service, to make it available in the public network
|
||||
- traefik.enable=true
|
||||
# Use the traefik-public network (declared below)
|
||||
- traefik.docker.network=traefik-public
|
||||
# admin-auth middleware with HTTP Basic auth
|
||||
# Using the environment variables USERNAME and HASHED_PASSWORD
|
||||
- traefik.http.middlewares.admin-auth.basicauth.users=admin:${HASHED_PASSWORD:?No HASHED_PASSWORD set}
|
||||
# Uses the environment variable TRAEFIK_DOMAIN
|
||||
- traefik.http.routers.traefik-public-http.rule=Host(`${TRAEFIK_DOMAIN:?No TRAEFIK_DOMAIN set}`)
|
||||
- traefik.http.routers.traefik-public-http.entrypoints=http
|
||||
# Use the special Traefik service api@internal with the web UI/Dashboard
|
||||
- traefik.http.routers.traefik-public-http.service=api@internal
|
||||
# Enable HTTP Basic auth, using the middleware created above
|
||||
- traefik.http.routers.traefik-public-http.middlewares=admin-auth
|
||||
# Define the port inside of the Docker service to use
|
||||
- traefik.http.services.traefik-public.loadbalancer.server.port=8080
|
||||
command:
|
||||
# Enable Docker in Traefik, so that it reads labels from Docker services
|
||||
- --providers.docker=true
|
||||
# Do not expose all Docker services, only the ones explicitly exposed
|
||||
- --providers.docker.exposedbydefault=false
|
||||
# Create an entrypoint http listening on port 80
|
||||
- --entrypoints.http.address=:80
|
||||
# Enable the access log, with HTTP requests
|
||||
- --accesslog
|
||||
# Enable the Traefik log, for configurations and errors
|
||||
- --log
|
||||
# Enable the Dashboard and API
|
||||
- --api
|
||||
ports:
|
||||
- 80:80
|
||||
volumes:
|
||||
- /var/run/docker.sock:/var/run/docker.sock:ro
|
||||
networks:
|
||||
- traefik-public
|
||||
|
||||
networks:
|
||||
traefik-public:
|
||||
name: traefik-public
|
||||
external: false
|
||||
Reference in New Issue
Block a user