Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .ahoy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ commands:
usage: Build project.
cmd: |
docker compose up -d "$@" &&
docker compose exec -T test dockerize -wait tcp://mariadb:3306 -timeout 2m &&
docker compose exec -T cli dockerize -wait tcp://mariadb:3306 -timeout 2m &&
ahoy info;

down:
Expand All @@ -26,7 +26,7 @@ commands:
usage: Build project.
cmd: |
docker compose up -d --build "$@" &&
docker compose exec -T test dockerize -wait tcp://mariadb:3306 -timeout 2m &&
docker compose exec -T cli dockerize -wait tcp://mariadb:3306 -timeout 2m &&
ahoy govcms-deploy && ahoy info;

cli:
Expand Down
52 changes: 27 additions & 25 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,22 +66,6 @@ services:
volumes_from: ### Local overrides to mount host SSH keys. Automatically removed in CI.
- container:amazeeio-ssh-agent ### Local overrides to mount host SSH keys. Automatically removed in CI.

test:
build:
context: .
dockerfile: .docker/Dockerfile.test
args:
CLI_IMAGE: *lagoon-project
GOVCMS_IMAGE_VERSION: *govcms-image-version
SITE_AUDIT_VERSION: ${SITE_AUDIT_VERSION:-7.x-3.x}
labels:
lagoon.type: none
<< : *default-volumes
depends_on:
- cli
environment:
<< : *default-environment

nginx:
build:
context: .
Expand Down Expand Up @@ -151,15 +135,33 @@ services:
# environment:
# << : *default-environment

chrome:
image: selenium/standalone-chrome:4.5.2-20221021
shm_size: '1gb'
platform: linux/amd64
depends_on:
- test
labels:
lagoon.type: none
<< : *default-volumes
# Uncomment to enable testing.
# test:
# build:
# context: .
# dockerfile: .docker/Dockerfile.test
# args:
# CLI_IMAGE: *lagoon-project
# GOVCMS_IMAGE_VERSION: *govcms-image-version
# SITE_AUDIT_VERSION: ${SITE_AUDIT_VERSION:-7.x-3.x}
# labels:
# lagoon.type: none
# << : *default-volumes
# depends_on:
# - cli
# environment:
# << : *default-environment

# Uncomment to enable chrome.
# chrome:
# image: selenium/standalone-chrome:4.5.2-20221021
# shm_size: '1gb'
# platform: linux/amd64
# depends_on:
# - test
# labels:
# lagoon.type: none
# << : *default-volumes

networks:
amazeeio-network:
Expand Down