From 127a26906c52dec41094ba10ba4069f683a69d0f Mon Sep 17 00:00:00 2001 From: Derek Roberts Date: Wed, 4 Dec 2024 14:09:56 -0800 Subject: [PATCH 1/5] ci: test builder and shells --- legacy/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/legacy/Dockerfile b/legacy/Dockerfile index 62009b82f0..f38ec671cc 100644 --- a/legacy/Dockerfile +++ b/legacy/Dockerfile @@ -46,4 +46,5 @@ HEALTHCHECK CMD curl -f http://localhost:${PORT}/actuator/health | grep '"status ENV SPRING_PROFILES_ACTIVE=container # Startup -ENTRYPOINT ["/app/nr-forest-client-legacy"] \ No newline at end of file +SHELL [] +ENTRYPOINT ["/app/nr-forest-client-legacy"] From e7ded23286644fce611e6444088f0078098b5e06 Mon Sep 17 00:00:00 2001 From: Derek Roberts Date: Wed, 4 Dec 2024 14:13:08 -0800 Subject: [PATCH 2/5] Test --- legacy/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/legacy/Dockerfile b/legacy/Dockerfile index f38ec671cc..350508f4e1 100644 --- a/legacy/Dockerfile +++ b/legacy/Dockerfile @@ -46,5 +46,5 @@ HEALTHCHECK CMD curl -f http://localhost:${PORT}/actuator/health | grep '"status ENV SPRING_PROFILES_ACTIVE=container # Startup -SHELL [] -ENTRYPOINT ["/app/nr-forest-client-legacy"] +SHELL ["/app/nr-forest-client-legacy"] +ENTRYPOINT ["--spring.profiles.active=container"] From dd346d37307ecd663199a242aa87cc9a95635ba0 Mon Sep 17 00:00:00 2001 From: Derek Roberts Date: Wed, 4 Dec 2024 14:58:01 -0800 Subject: [PATCH 3/5] Mess with entrypoint --- legacy/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/legacy/Dockerfile b/legacy/Dockerfile index 350508f4e1..29efde0804 100644 --- a/legacy/Dockerfile +++ b/legacy/Dockerfile @@ -46,5 +46,4 @@ HEALTHCHECK CMD curl -f http://localhost:${PORT}/actuator/health | grep '"status ENV SPRING_PROFILES_ACTIVE=container # Startup -SHELL ["/app/nr-forest-client-legacy"] -ENTRYPOINT ["--spring.profiles.active=container"] +ENTRYPOINT ["/app/nr-forest-client-legacy", "--spring.profiles.active=container"] From e5f695e9af83e4756206d3f8f67740414e8d2aa8 Mon Sep 17 00:00:00 2001 From: Derek Roberts Date: Wed, 4 Dec 2024 15:03:42 -0800 Subject: [PATCH 4/5] Mess with entrypoint --- .github/workflows/pr-open.yml | 2 +- legacy/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml index 0302926e58..438a4d5d3f 100644 --- a/.github/workflows/pr-open.yml +++ b/.github/workflows/pr-open.yml @@ -30,7 +30,7 @@ jobs: matrix: package: [backend, database, frontend, legacy, legacydb, processor] steps: - - uses: bcgov-nr/action-builder-ghcr@v2.3.0 + - uses: bcgov-nr/action-builder-ghcr@test name: Build (${{ matrix.package }}) with: package: ${{ matrix.package }} diff --git a/legacy/Dockerfile b/legacy/Dockerfile index 29efde0804..4bc585f391 100644 --- a/legacy/Dockerfile +++ b/legacy/Dockerfile @@ -46,4 +46,4 @@ HEALTHCHECK CMD curl -f http://localhost:${PORT}/actuator/health | grep '"status ENV SPRING_PROFILES_ACTIVE=container # Startup -ENTRYPOINT ["/app/nr-forest-client-legacy", "--spring.profiles.active=container"] +ENTRYPOINT ["/app/nr-forest-client-legacy"] From c74d4de88cca5905df4e925095d025fb8aafbb13 Mon Sep 17 00:00:00 2001 From: Derek Roberts Date: Wed, 4 Dec 2024 15:08:59 -0800 Subject: [PATCH 5/5] Restore builder version --- .github/workflows/pr-open.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml index 438a4d5d3f..0302926e58 100644 --- a/.github/workflows/pr-open.yml +++ b/.github/workflows/pr-open.yml @@ -30,7 +30,7 @@ jobs: matrix: package: [backend, database, frontend, legacy, legacydb, processor] steps: - - uses: bcgov-nr/action-builder-ghcr@test + - uses: bcgov-nr/action-builder-ghcr@v2.3.0 name: Build (${{ matrix.package }}) with: package: ${{ matrix.package }}