From 6bb22eb1775fcff4ef1c047e86835bbc298a6291 Mon Sep 17 00:00:00 2001 From: Gareth Healy Date: Mon, 24 Mar 2025 11:35:00 +0000 Subject: [PATCH 1/7] added docker run step to validate image --- .github/workflows/build.yaml | 3 +++ pom.xml | 2 +- src/main/docker/version.json | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 60e31a6..204f6f2 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -88,6 +88,9 @@ jobs: oci: true tags: "${{ steps.image_tags.outputs.IMAGE_TAGS }}" + - name: Run docker image + run: docker run ghcr.io/garethahealy/github-stats/github-stats:latest help + - name: Push to ghcr.io if: startsWith(github.ref, 'refs/tags/') uses: redhat-actions/push-to-registry@5ed88d269cf581ea9ef6dd6806d01562096bee9c # v2 diff --git a/pom.xml b/pom.xml index b3e54fd..b0c7a93 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.github.garethahealy github-stats - 3.0.0 + 3.0.1-SNAPSHOT 3.14.0 21 diff --git a/src/main/docker/version.json b/src/main/docker/version.json index f6c42b9..f9e5128 100644 --- a/src/main/docker/version.json +++ b/src/main/docker/version.json @@ -1,3 +1,3 @@ { - "version": "v3.0.0" + "version": "v3.0.1-SNAPSHOT" } From dfd69cbd67bcfdc0aab260270f67d267726bd94e Mon Sep 17 00:00:00 2001 From: Gareth Healy Date: Mon, 24 Mar 2025 11:42:06 +0000 Subject: [PATCH 2/7] bumped base images --- src/main/docker/Dockerfile.jvm | 5 +++-- src/main/docker/Dockerfile.native | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/docker/Dockerfile.jvm b/src/main/docker/Dockerfile.jvm index 69da19d..81b97db 100644 --- a/src/main/docker/Dockerfile.jvm +++ b/src/main/docker/Dockerfile.jvm @@ -26,7 +26,8 @@ # This scripts computes the command line to execute your Java application, and # includes memory/GC tuning. # You can configure the behavior using the following environment properties: -# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class") +# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class") - Be aware that this will override +# the default JVM options, use `JAVA_OPTS_APPEND` to append options # - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options # in JAVA_OPTS (example: "-Dsome.property=foo") # - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is @@ -77,7 +78,7 @@ # accessed directly. (example: "foo.example.com,bar.example.com") # ### -FROM registry.access.redhat.com/ubi8/openjdk-17:1.21-1.1741864856@sha256:7c3c4a9d59a534b11966b0d48727eede7f3495d1ebfa25e0813cad3c91b2a153 +FROM registry.access.redhat.com/ubi9/openjdk-21:1.21 ENV LANGUAGE='en_US:en' diff --git a/src/main/docker/Dockerfile.native b/src/main/docker/Dockerfile.native index cbb72fd..19afe4a 100644 --- a/src/main/docker/Dockerfile.native +++ b/src/main/docker/Dockerfile.native @@ -13,13 +13,15 @@ # # docker run -i --rm -p 8080:8080 quarkus/github-stats # +# The ` registry.access.redhat.com/ubi9/ubi-minimal:9.5` base image is based on UBI 9. +# To use UBI 8, switch to `quay.io/ubi8/ubi-minimal:8.10`. ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1216@sha256:3544399c893a7f32d16220d22d493ae32e61379668e32bc54a74d8eb6ece80fc +FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ && chown 1001:root /work -COPY --chown=1001:root target/*-runner /work/application +COPY --chown=1001:root --chmod=0755 target/*-runner /work/application EXPOSE 8080 USER 1001 From 9667016b33c1b28217db3462591b596482e4895e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Mar 2025 11:42:58 +0000 Subject: [PATCH 3/7] Update registry.access.redhat.com/ubi9/openjdk-21 Docker tag to v1.21-3.1741781261 --- src/main/docker/Dockerfile.jvm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/docker/Dockerfile.jvm b/src/main/docker/Dockerfile.jvm index 81b97db..dfc12fe 100644 --- a/src/main/docker/Dockerfile.jvm +++ b/src/main/docker/Dockerfile.jvm @@ -78,7 +78,7 @@ # accessed directly. (example: "foo.example.com,bar.example.com") # ### -FROM registry.access.redhat.com/ubi9/openjdk-21:1.21 +FROM registry.access.redhat.com/ubi9/openjdk-21:1.21-3.1741781261@sha256:fa55b9f126da0d855e3709473e2237ad500f8d8e6a059f99b3ca10cdc2c5de58 ENV LANGUAGE='en_US:en' From 07533491ed3370ad37bea5328e7c5e4af9e299f9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Mar 2025 11:43:02 +0000 Subject: [PATCH 4/7] Update registry.access.redhat.com/ubi9/ubi-minimal Docker tag to v9.5-1741850109 --- src/main/docker/Dockerfile.native | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/docker/Dockerfile.native b/src/main/docker/Dockerfile.native index 19afe4a..88ff9ba 100644 --- a/src/main/docker/Dockerfile.native +++ b/src/main/docker/Dockerfile.native @@ -16,7 +16,7 @@ # The ` registry.access.redhat.com/ubi9/ubi-minimal:9.5` base image is based on UBI 9. # To use UBI 8, switch to `quay.io/ubi8/ubi-minimal:8.10`. ### -FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5 +FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5-1741850109@sha256:bafd57451de2daa71ed301b277d49bd120b474ed438367f087eac0b885a668dc WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ From f3eac3535ff06d6674c4afd4fbd2f1a0d2439a68 Mon Sep 17 00:00:00 2001 From: Gareth Healy Date: Mon, 24 Mar 2025 11:50:01 +0000 Subject: [PATCH 5/7] switched image ref --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 204f6f2..3769e93 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -89,7 +89,7 @@ jobs: tags: "${{ steps.image_tags.outputs.IMAGE_TAGS }}" - name: Run docker image - run: docker run ghcr.io/garethahealy/github-stats/github-stats:latest help + run: docker run localhost/github-stats:latest help - name: Push to ghcr.io if: startsWith(github.ref, 'refs/tags/') From 3e228da8d86c6c052336e87a11b1de07a70d186d Mon Sep 17 00:00:00 2001 From: Gareth Healy Date: Mon, 24 Mar 2025 11:56:58 +0000 Subject: [PATCH 6/7] tweaking command --- .github/workflows/build.yaml | 6 +++--- .../githubstats/services/stats/CollectStatsService.java | 2 +- .../services/users/utils/OrgMemberCsvService.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3769e93..26147ab 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -45,7 +45,7 @@ jobs: - name: Test run: ./mvnw test --batch-mode - - name: Run help + - name: Run help command id: runner run: | runners=(target/github-stats-*-runner) @@ -88,8 +88,8 @@ jobs: oci: true tags: "${{ steps.image_tags.outputs.IMAGE_TAGS }}" - - name: Run docker image - run: docker run localhost/github-stats:latest help + - name: Run image + run: podman run localhost/github-stats:latest help - name: Push to ghcr.io if: startsWith(github.ref, 'refs/tags/') diff --git a/src/main/java/com/garethahealy/githubstats/services/stats/CollectStatsService.java b/src/main/java/com/garethahealy/githubstats/services/stats/CollectStatsService.java index 3a43419..4cd1e7f 100644 --- a/src/main/java/com/garethahealy/githubstats/services/stats/CollectStatsService.java +++ b/src/main/java/com/garethahealy/githubstats/services/stats/CollectStatsService.java @@ -124,7 +124,7 @@ private Repository runnable(GHRepository repo, Set configRepos, Set repositories, File output) throws IOException { CSVFormat csvFormat = CSVFormat.Builder.create(CSVFormat.DEFAULT) .setHeader((Repository.Headers.class)) - .build(); + .get(); try (Writer writer = Files.newBufferedWriter(output.toPath(), StandardCharsets.UTF_8, StandardOpenOption.TRUNCATE_EXISTING)) { try (CSVPrinter csvPrinter = new CSVPrinter(writer, csvFormat)) { diff --git a/src/main/java/com/garethahealy/githubstats/services/users/utils/OrgMemberCsvService.java b/src/main/java/com/garethahealy/githubstats/services/users/utils/OrgMemberCsvService.java index 0334616..838ae4c 100644 --- a/src/main/java/com/garethahealy/githubstats/services/users/utils/OrgMemberCsvService.java +++ b/src/main/java/com/garethahealy/githubstats/services/users/utils/OrgMemberCsvService.java @@ -53,7 +53,7 @@ public OrgMemberRepository parse(File input) throws IOException { CSVFormat csvFormat = CSVFormat.Builder.create(CSVFormat.DEFAULT) .setHeader(OrgMember.Headers.class) .setSkipHeaderRecord(true) - .build(); + .get(); try (Reader reader = new BufferedReader(new FileReader(input, StandardCharsets.UTF_8))) { Iterable records = csvFormat.parse(reader); @@ -99,7 +99,7 @@ public void write(OrgMemberRepository orgMemberRepository) throws IOException { CSVFormat csvFormat = CSVFormat.Builder.create(CSVFormat.DEFAULT) .setHeader(OrgMember.Headers.class) - .build(); + .get(); try (Writer writer = Files.newBufferedWriter(output, StandardCharsets.UTF_8, StandardOpenOption.TRUNCATE_EXISTING)) { try (CSVPrinter csvPrinter = new CSVPrinter(writer, csvFormat)) { From 42a44c0334caf95f73622abb807051839e47bd8b Mon Sep 17 00:00:00 2001 From: Gareth Healy Date: Mon, 24 Mar 2025 12:05:54 +0000 Subject: [PATCH 7/7] next release --- pom.xml | 2 +- src/main/docker/version.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b0c7a93..3e5eb87 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.github.garethahealy github-stats - 3.0.1-SNAPSHOT + 3.0.1 3.14.0 21 diff --git a/src/main/docker/version.json b/src/main/docker/version.json index f9e5128..d78a8ce 100644 --- a/src/main/docker/version.json +++ b/src/main/docker/version.json @@ -1,3 +1,3 @@ { - "version": "v3.0.1-SNAPSHOT" + "version": "v3.0.1" }