diff --git a/docker-compose.yml b/docker-compose.yml index 2c93b96ee..d0585344f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.15.5}:2020-11-20 environment: - FAKE_DNS=10.77.77.77 - - BOULDER_CONFIG_DIR=test/config + - BOULDER_CONFIG_DIR=labca/config - GOFLAGS=-mod=vendor # This is required so Python doesn't throw an error when printing # non-ASCII to stdout. @@ -18,6 +18,7 @@ services: - RACE volumes: - .:/go/src/github.com/letsencrypt/boulder:cached + - /home/labca/boulder_labca:/go/src/github.com/letsencrypt/boulder/labca - ./.gocache:/root/.cache/go-build:cached networks: bluenet: @@ -57,10 +58,18 @@ services: - 8055:8055 # dns-test-srv updates depends_on: - 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 bmysql: image: mariadb:10.5 + volumes: + - dbdata:/var/lib/mysql networks: bluenet: aliases: @@ -74,20 +83,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.15.5}:2020-11-20 - 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: