From 6dde06f3705417b6f9fffa1826d9d588fc74a155 Mon Sep 17 00:00:00 2001 From: David Cliff Date: Wed, 13 Dec 2023 16:10:33 +0000 Subject: [PATCH] Ensure CI gets .atlas version --- .atlas | 2 +- .github/workflows/build_test.yml | 2 +- .version | 2 +- docker-compose.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.atlas b/.atlas index ccefc022a..390566760 100644 --- a/.atlas +++ b/.atlas @@ -1 +1 @@ -0.0.137 +0.0.139 diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 367996dda..2ae4d31b7 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -33,7 +33,7 @@ jobs: - name: Start server run: | set -x - docker-compose -f docker-compose.yml -f docker-compose.ci.yml up -d + ATLAS=$(cat .atlas) docker-compose -f docker-compose.yml -f docker-compose.ci.yml up -d - name: Create database and migrate run: | docker-compose exec -T web bundle exec rake db:create diff --git a/.version b/.version index d245ee865..6d6ae0c17 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.3.19 +2.3.20 diff --git a/docker-compose.yml b/docker-compose.yml index df3fa4a52..a6e7bee0c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,7 +24,7 @@ services: ports: - 3000:3000 atlas: - image: nakatomi/atlas_web + image: nakatomi/atlas_web:${ATLAS} entrypoint: /home/atlas/web/docker-entrypoint.sh ports: - 3001:3000