diff --git a/docker-compose.yml b/docker-compose.yml index b0e2c1f1..30426452 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,9 +6,10 @@ services: environment: FAKE_DNS: 127.0.0.1 PKCS11_PROXY_SOCKET: tcp://boulder-hsm:5657 - BOULDER_CONFIG_DIR: test/config + BOULDER_CONFIG_DIR: labca/config 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: @@ -47,8 +48,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.11.2}:2018-11-19 @@ -61,8 +68,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: @@ -72,16 +87,37 @@ services: command: mysqld --bind-address=0.0.0.0 logging: driver: none - netaccess: + logging: + driver: "json-file" + options: + max-size: "500k" + max-file: "5" + restart: always + labca: image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.11.2}:2018-11-19 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: