Files
labca/patches/docker-compose.patch
2022-10-26 20:38:34 +02:00

144 lines
3.9 KiB
Diff

diff --git a/docker-compose.yml b/docker-compose.yml
index ddde0231..b06711b7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,7 @@ services:
image: &boulder_image letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-go1.19.2_2022-10-05}
environment:
FAKE_DNS: 10.77.77.77
- BOULDER_CONFIG_DIR: test/config
+ BOULDER_CONFIG_DIR: labca/config
GOFLAGS: -mod=vendor
# Go 1.18 turned off SHA-1 validation on CSRs (and certs, but that doesn't
# affect us) by default, but it can be turned back on with the x509sha1
@@ -16,6 +16,8 @@ services:
GODEBUG: x509sha1=1
volumes:
- .:/boulder:cached
+ - /home/labca/boulder_labca:/boulder/labca
+ - /home/labca/nginx_data/static:/wwwstatic
- ./.gocache:/root/.cache/go-build:cached
- ./.hierarchy:/hierarchy/:cached
- ./.softhsm-tokens/:/var/lib/softhsm/tokens/:cached
@@ -35,18 +37,26 @@ services:
# IP (running consul).
# (https://docs.docker.com/config/containers/container-networking/#dns-services).
dns: 10.55.55.10
- ports:
- - 4001:4001 # ACMEv2
- - 4002:4002 # OCSP
- - 4003:4003 # OCSP
+ expose:
+ - 4001 # ACMEv2
+ - 4002 # OCSP
+ - 4003 # OCSP
depends_on:
- bmysql
- bconsul
- entrypoint: test/entrypoint.sh
+ entrypoint: labca/entrypoint.sh
working_dir: &boulder_working_dir /boulder
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "500k"
+ max-file: "5"
+ restart: always
bmysql:
image: mariadb:10.5
+ volumes:
+ - dbdata:/var/lib/mysql
networks:
bluenet:
aliases:
@@ -60,7 +70,11 @@ services:
# small.
command: mysqld --bind-address=0.0.0.0 --slow-query-log --log-output=TABLE --log-queries-not-using-indexes=ON
logging:
- driver: none
+ driver: "json-file"
+ options:
+ max-size: "500k"
+ max-file: "5"
+ restart: always
bconsul:
image: hashicorp/consul:1.13.1
@@ -71,18 +85,68 @@ services:
ipv4_address: 10.55.55.10
command: "consul agent -dev -config-format=hcl -config-file=/test/consul/config.hcl"
- netaccess:
+ labca:
image: *boulder_image
- environment:
- GO111MODULE: "on"
- GOFLAGS: -mod=vendor
- BOULDER_CONFIG_DIR: test/config
networks:
- bluenet
volumes:
+ - /home/labca/admin:/go/src/labca
+ - ./.gocache:/root/.cache/go-build
+ - /home/labca/nginx_data/static:/wwwstatic
+ - /home/labca/backup:/backup
- .:/boulder
- working_dir: *boulder_working_dir
- entrypoint: test/entrypoint-netaccess.sh
+ - /home/labca/boulder_labca:/boulder/labca
+ expose:
+ - 3000
+ depends_on:
+ - bmysql
+ working_dir: /go/src/labca
+ command: ./setup.sh
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "500k"
+ max-file: "5"
+ restart: always
+
+ nginx:
+ image: nginx:1.21.6
+ restart: always
+ networks:
+ - bluenet
+ ports:
+ - 80:80
+ - 443:443
+ volumes:
+ - /home/labca/nginx_data/conf.d:/etc/nginx/conf.d
+ - /home/labca/nginx_data/ssl:/etc/nginx/ssl
+ - /home/labca/nginx_data/static:/var/www/html
+
+ control:
+ image: *boulder_image
+ networks:
+ - bluenet
+ volumes:
+ - /var/run/docker.sock:/var/run/docker.sock
+ - /home/labca/admin:/admin
+ - /home/labca/labca:/labca
+ - /home/labca/backup:/backup
+ - /home/labca/control_logs:/logs
+ - .:/boulder
+ - /home/labca/boulder_labca:/boulder/labca
+ - /home/labca/nginx_data/conf.d:/etc/nginx/conf.d
+ - /home/labca/nginx_data/ssl:/etc/nginx/ssl
+ - /home/labca/nginx_data/static:/var/www/html
+ expose:
+ - 3030
+ environment:
+ LABCA_FQDN: ${LABCA_FQDN:-notset}
+ working_dir: /labca
+ command: ./control.sh
+ restart: always
+
+volumes:
+ dbdata:
networks:
bluenet: