From 6e16d41c5212c198d6d866a492b6df6f47aa76bc Mon Sep 17 00:00:00 2001 From: LaRita Robinson Date: Thu, 2 Feb 2023 11:20:26 -0500 Subject: [PATCH] Bring in additional changes as used in adventist --- .github/workflows/base.yaml | 18 ++++++++++++++++++ .github/workflows/build-lint-test-action.yaml | 2 +- docker-compose.yml | 3 +++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/base.yaml diff --git a/.github/workflows/base.yaml b/.github/workflows/base.yaml new file mode 100644 index 00000000..d9edf08c --- /dev/null +++ b/.github/workflows/base.yaml @@ -0,0 +1,18 @@ +name: "Build Base" +on: + workflow_dispatch: + inputs: + debug_enabled: + type: boolean + description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' + required: false + default: false + +jobs: + build: + uses: scientist-softserv/actions/.github/workflows/build.yaml@v0.0.6 + secrets: inherit + with: + platforms: "linux/amd64" + target: hyku-base + \ No newline at end of file diff --git a/.github/workflows/build-lint-test-action.yaml b/.github/workflows/build-lint-test-action.yaml index 094c0708..17e11671 100644 --- a/.github/workflows/build-lint-test-action.yaml +++ b/.github/workflows/build-lint-test-action.yaml @@ -20,7 +20,7 @@ jobs: secrets: inherit with: platforms: "linux/amd64" - target: hyku-base + target: hyku-web worker: true workerTarget: hyku-worker test: diff --git a/docker-compose.yml b/docker-compose.yml index 24a4a71e..ac58d81c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,9 @@ x-app: &app args: - HYKU_BULKRAX_ENABLED=true # command: sh -l -c "bundle && bundle exec puma -v -b tcp://0.0.0.0:3000" + cache_from: + - ghcr.io/scientist-softserv/britishlibrary/base:latest + - ghcr.io/scientist-softserv/britishlibrary/web:latest image: ghcr.io/scientist-softserv/britishlibrary:${TAG:-latest} env_file: - .env