From aa27b3b53264e9e6f19a02161b78882d397424b2 Mon Sep 17 00:00:00 2001 From: Matthew F Leader Date: Mon, 5 Aug 2024 11:36:46 -0400 Subject: [PATCH 1/2] GitHub CI Docker Compose Update Signed-off-by: Matthew F Leader --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 905bf48..3fe431f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -26,9 +26,9 @@ jobs: path: dist if-no-files-found: error - name: Build image - run: docker-compose build + run: docker compose build - name: Run plugin - run: docker-compose up + run: docker compose up - name: Extract coverage data run: | docker create --name test ghcr.io/arcalot/arcaflow-plugin-wait:latest From 8fee8c7b0fe1dd47ee08230ab1f4590c6773cd33 Mon Sep 17 00:00:00 2001 From: Matthew F Leader Date: Mon, 5 Aug 2024 14:34:01 -0400 Subject: [PATCH 2/2] upgrade sdk os base image more --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3439f17..75b9e73 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG package=arcaflow_plugin_wait # STAGE 1 -- Build module dependencies and run tests # The 'poetry' and 'coverage' modules are installed and verson-controlled in the # quay.io/arcalot/arcaflow-plugin-baseimage-python-buildbase image to limit drift -FROM quay.io/arcalot/arcaflow-plugin-baseimage-python-buildbase:0.4.0 as build +FROM quay.io/arcalot/arcaflow-plugin-baseimage-python-buildbase:0.4.2 as build ARG package COPY poetry.lock /app/ @@ -26,7 +26,7 @@ RUN python -m coverage run tests/test_${package}.py \ # STAGE 2 -- Build final plugin image -FROM quay.io/arcalot/arcaflow-plugin-baseimage-python-osbase:0.4.0 +FROM quay.io/arcalot/arcaflow-plugin-baseimage-python-osbase:0.4.2 ARG package COPY --from=build /app/requirements.txt /app/