diff --git a/docker-compose.yml b/docker-compose.yml index e34704a4d..46365bdcf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: environment: FAKE_DNS: 10.77.77.77 PKCS11_PROXY_SOCKET: tcp://boulder-hsm:5657 - BOULDER_CONFIG_DIR: test/config + BOULDER_CONFIG_DIR: labca/config GO111MODULE: "on" GOFLAGS: "-mod=vendor" # This is required so Python doesn't throw an error when printing @@ -14,6 +14,7 @@ services: PYTHONIOENCODING: "utf-8" volumes: - .:/go/src/github.com/letsencrypt/boulder + - /home/labca/boulder_labca:/go/src/github.com/letsencrypt/boulder/labca - ./.gocache:/root/.cache/go-build networks: bluenet: @@ -54,8 +55,14 @@ services: depends_on: - bhsm - bmysql - entrypoint: test/entrypoint.sh + entrypoint: labca/entrypoint.sh working_dir: /go/src/github.com/letsencrypt/boulder + logging: + driver: "json-file" + options: + max-size: "500k" + max-file: "5" + restart: always bhsm: # To minimize fetching this should be the same version used above image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.13.2}:2020-04-08 @@ -68,8 +75,16 @@ services: bluenet: aliases: - boulder-hsm + logging: + driver: "json-file" + options: + max-size: "500k" + max-file: "5" + restart: always bmysql: image: mariadb:10.3 + volumes: + - dbdata:/var/lib/mysql networks: bluenet: aliases: @@ -83,20 +98,36 @@ 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 - netaccess: + driver: "json-file" + options: + max-size: "500k" + max-file: "5" + restart: always + labca: image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.13.2}:2020-04-08 - environment: - GO111MODULE: "on" - GOFLAGS: "-mod=vendor" networks: - bluenet volumes: - - .:/go/src/github.com/letsencrypt/boulder - working_dir: /go/src/github.com/letsencrypt/boulder - entrypoint: test/entrypoint-netaccess.sh + - /home/labca/admin:/go/src/labca + - ./.gocache:/root/.cache/go-build + - /var/www/html:/wwwstatic + - .:/boulder + - /home/labca/boulder_labca:/boulder/labca + ports: + - 3000: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 + +volumes: + dbdata: networks: bluenet: