From 60e515e01e9c8c8f0c7b44d73e2bcaa868c5d20e Mon Sep 17 00:00:00 2001 From: Matthew B <106352182+artntek@users.noreply.github.com> Date: Thu, 19 Oct 2023 15:51:04 -0700 Subject: [PATCH 1/4] added branch name pattern: '*-image-auto-build' --- .github/workflows/build-test-publish.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-test-publish.yaml b/.github/workflows/build-test-publish.yaml index 852ea392..0f2d92c6 100644 --- a/.github/workflows/build-test-publish.yaml +++ b/.github/workflows/build-test-publish.yaml @@ -5,6 +5,7 @@ on: branches: - feature* - develop + - '*-image-auto-build' tags: [ 'v*.*.*' ] env: From 1e19fd2259730b774f136e6221a01df3cf4f3fc4 Mon Sep 17 00:00:00 2001 From: Matthew B <106352182+artntek@users.noreply.github.com> Date: Thu, 19 Oct 2023 15:52:14 -0700 Subject: [PATCH 2/4] changed auto-build to auto-publish --- .github/workflows/build-test-publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test-publish.yaml b/.github/workflows/build-test-publish.yaml index 0f2d92c6..49939509 100644 --- a/.github/workflows/build-test-publish.yaml +++ b/.github/workflows/build-test-publish.yaml @@ -5,7 +5,7 @@ on: branches: - feature* - develop - - '*-image-auto-build' + - '*-image-auto-publish' tags: [ 'v*.*.*' ] env: From 4ee77195ffffe385d396da3f41ed1a59bbfe49c1 Mon Sep 17 00:00:00 2001 From: Matthew B <106352182+artntek@users.noreply.github.com> Date: Mon, 23 Oct 2023 14:52:21 -0700 Subject: [PATCH 3/4] Dockerfile add labels; pom change version to DEVELOP --- docker/Dockerfile | 12 +++++------- pom.xml | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 22774208..4241e331 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -21,18 +21,16 @@ RUN useradd d1indexer # The most recently built jar file is copied from the maven build directory to this dir by maven, so that # it can be copied to the image. -COPY ../target/dataone-index-worker-${TAG}-shaded.jar . -COPY ./docker/entrypoint.sh . - -# Change the ownership of the jar and sh files -RUN chown d1indexer dataone-index-worker-${TAG}-shaded.jar -RUN chown d1indexer entrypoint.sh +COPY --chown=d1indexer ../target/dataone-index-worker-${TAG}-shaded.jar . +COPY --chown=d1indexer ./docker/entrypoint.sh . #Run Container as d1indexer USER d1indexer # Connect this image to a GitHub repository -LABEL org.opencontainers.image.source https://github.com/dataoneorg/dataone-indexer +LABEL org.opencontainers.image.source="https://github.com/dataoneorg/dataone-indexer" +LABEL org.opencontainers.image.title="DataONE Indexer" +LABEL org.opencontainers.image.version=${TAG} # Run the Worker process CMD ./entrypoint.sh diff --git a/pom.xml b/pom.xml index d41ff592..860ed31f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.dataone dataone-index-worker - 2.4.0 + DEVELOP jar dataone-index-worker http://maven.apache.org From f606a6d6188feee7a3aa41779e94a5fc1e3b4a1a Mon Sep 17 00:00:00 2001 From: Matthew B <106352182+artntek@users.noreply.github.com> Date: Mon, 23 Oct 2023 14:55:42 -0700 Subject: [PATCH 4/4] Revert "Dockerfile add labels; pom change version to DEVELOP" This reverts commit 4ee77195ffffe385d396da3f41ed1a59bbfe49c1. --- docker/Dockerfile | 12 +++++++----- pom.xml | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 4241e331..22774208 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -21,16 +21,18 @@ RUN useradd d1indexer # The most recently built jar file is copied from the maven build directory to this dir by maven, so that # it can be copied to the image. -COPY --chown=d1indexer ../target/dataone-index-worker-${TAG}-shaded.jar . -COPY --chown=d1indexer ./docker/entrypoint.sh . +COPY ../target/dataone-index-worker-${TAG}-shaded.jar . +COPY ./docker/entrypoint.sh . + +# Change the ownership of the jar and sh files +RUN chown d1indexer dataone-index-worker-${TAG}-shaded.jar +RUN chown d1indexer entrypoint.sh #Run Container as d1indexer USER d1indexer # Connect this image to a GitHub repository -LABEL org.opencontainers.image.source="https://github.com/dataoneorg/dataone-indexer" -LABEL org.opencontainers.image.title="DataONE Indexer" -LABEL org.opencontainers.image.version=${TAG} +LABEL org.opencontainers.image.source https://github.com/dataoneorg/dataone-indexer # Run the Worker process CMD ./entrypoint.sh diff --git a/pom.xml b/pom.xml index 860ed31f..d41ff592 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.dataone dataone-index-worker - DEVELOP + 2.4.0 jar dataone-index-worker http://maven.apache.org