From c50e3b1757ce0e09b872c0b5cad2096417b1f7b7 Mon Sep 17 00:00:00 2001 From: Rob Tjalma Date: Wed, 22 Sep 2021 13:17:07 +0200 Subject: [PATCH 1/5] Updated Docker Hub password to token Signed-off-by: Rob Tjalma --- .github/workflows/release-project.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml index 1185b9bc..5b560331 100644 --- a/.github/workflows/release-project.yml +++ b/.github/workflows/release-project.yml @@ -18,7 +18,7 @@ jobs: uses: docker/login-action@v1 with: username: ${{ secrets.DOCKER_HUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_PASSWORD }} + password: ${{ secrets.DOCKER_HUB_TOKEN }} - name: Extract tag name id: extract_tagname shell: bash From cbc12941cf345d9333de3dca68e1c89d8edcb891 Mon Sep 17 00:00:00 2001 From: Rob Tjalma Date: Fri, 24 Sep 2021 12:38:35 +0200 Subject: [PATCH 2/5] Adjusted heap size Signed-off-by: Rob Tjalma --- app/src/main/docker/Dockerfile.jvm | 2 +- app/src/main/docker/Dockerfile.legacy-jar | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/docker/Dockerfile.jvm b/app/src/main/docker/Dockerfile.jvm index fcd9ec4a..15bd2319 100644 --- a/app/src/main/docker/Dockerfile.jvm +++ b/app/src/main/docker/Dockerfile.jvm @@ -41,7 +41,7 @@ RUN microdnf install curl ca-certificates ${JAVA_PACKAGE} \ && echo "securerandom.source=file:/dev/urandom" >> /etc/alternatives/jre/conf/security/java.security # Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size. -ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" +ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Xms256m -Xmx1024m" # We make four distinct layers so if there are application changes the library layers can be re-used COPY --chown=1001 target/quarkus-app/lib/ /deployments/lib/ COPY --chown=1001 target/quarkus-app/*.jar /deployments/ diff --git a/app/src/main/docker/Dockerfile.legacy-jar b/app/src/main/docker/Dockerfile.legacy-jar index 757aea70..68c9f31c 100644 --- a/app/src/main/docker/Dockerfile.legacy-jar +++ b/app/src/main/docker/Dockerfile.legacy-jar @@ -41,7 +41,7 @@ RUN microdnf install curl ca-certificates ${JAVA_PACKAGE} \ && echo "securerandom.source=file:/dev/urandom" >> /etc/alternatives/jre/conf/security/java.security # Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size. -ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" +ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Xms256m -Xmx1024m" COPY target/lib/* /deployments/lib/ COPY target/*-runner.jar /deployments/app.jar From 41923ef61d02e6e16b647f7c9a036b4e71d9b8a2 Mon Sep 17 00:00:00 2001 From: Rob Tjalma Date: Mon, 27 Sep 2021 12:57:05 +0200 Subject: [PATCH 3/5] Adjusted size Signed-off-by: Rob Tjalma --- app/src/main/docker/Dockerfile.jvm | 3 ++- app/src/main/docker/Dockerfile.legacy-jar | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/docker/Dockerfile.jvm b/app/src/main/docker/Dockerfile.jvm index 15bd2319..e7093d16 100644 --- a/app/src/main/docker/Dockerfile.jvm +++ b/app/src/main/docker/Dockerfile.jvm @@ -41,7 +41,8 @@ RUN microdnf install curl ca-certificates ${JAVA_PACKAGE} \ && echo "securerandom.source=file:/dev/urandom" >> /etc/alternatives/jre/conf/security/java.security # Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size. -ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Xms256m -Xmx1024m" +ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" +ENV JAVA_MAX_MEM_RATIO="70" # We make four distinct layers so if there are application changes the library layers can be re-used COPY --chown=1001 target/quarkus-app/lib/ /deployments/lib/ COPY --chown=1001 target/quarkus-app/*.jar /deployments/ diff --git a/app/src/main/docker/Dockerfile.legacy-jar b/app/src/main/docker/Dockerfile.legacy-jar index 68c9f31c..2d1120bb 100644 --- a/app/src/main/docker/Dockerfile.legacy-jar +++ b/app/src/main/docker/Dockerfile.legacy-jar @@ -41,7 +41,8 @@ RUN microdnf install curl ca-certificates ${JAVA_PACKAGE} \ && echo "securerandom.source=file:/dev/urandom" >> /etc/alternatives/jre/conf/security/java.security # Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size. -ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Xms256m -Xmx1024m" +ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" +ENV JAVA_MAX_MEM_RATIO="70" COPY target/lib/* /deployments/lib/ COPY target/*-runner.jar /deployments/app.jar From ac8f1e07635333e89551359cbab2cc9deb874891 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Sep 2021 11:16:12 +0000 Subject: [PATCH 4/5] Bump actions/setup-java from 2.3.0 to 2.3.1 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 2.3.0 to 2.3.1. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v2.3.0...v2.3.1) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/build-project.yml | 2 +- .github/workflows/release-project.yml | 2 +- .github/workflows/sonarcloud-analysis.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml index 34b88584..8e00dc7f 100644 --- a/.github/workflows/build-project.yml +++ b/.github/workflows/build-project.yml @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up JDK 1.11 - uses: actions/setup-java@v2.3.0 + uses: actions/setup-java@v2.3.1 with: distribution: 'zulu' java-version: '11' diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml index 5b560331..e6537ab5 100644 --- a/.github/workflows/release-project.yml +++ b/.github/workflows/release-project.yml @@ -25,7 +25,7 @@ jobs: # Extra the tagname form the git reference, value of GITHUB_REF will be something like refs/tags/. run: echo "##[set-output name=tagname;]$(echo ${GITHUB_REF##*/})" - name: Set up JDK 11 - uses: actions/setup-java@v2.3.0 + uses: actions/setup-java@v2.3.1 with: distribution: 'zulu' java-version: '11' diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml index b7fcdf15..c72a9d94 100644 --- a/.github/workflows/sonarcloud-analysis.yml +++ b/.github/workflows/sonarcloud-analysis.yml @@ -17,7 +17,7 @@ jobs: with: fetch-depth: 0 - name: Set up JDK 11 - uses: actions/setup-java@v2.3.0 + uses: actions/setup-java@v2.3.1 with: distribution: 'zulu' java-version: '11' From 327939b50735b1b8c1d8654f7cde460ee573b4c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Oct 2021 11:14:25 +0000 Subject: [PATCH 5/5] Bump whelk-io/maven-settings-xml-action from 18 to 20 Bumps [whelk-io/maven-settings-xml-action](https://github.com/whelk-io/maven-settings-xml-action) from 18 to 20. - [Release notes](https://github.com/whelk-io/maven-settings-xml-action/releases) - [Commits](https://github.com/whelk-io/maven-settings-xml-action/compare/v18...v20) --- updated-dependencies: - dependency-name: whelk-io/maven-settings-xml-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-project.yml | 2 +- .github/workflows/release-project.yml | 2 +- .github/workflows/sonarcloud-analysis.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml index 8e00dc7f..1bdae63c 100644 --- a/.github/workflows/build-project.yml +++ b/.github/workflows/build-project.yml @@ -20,7 +20,7 @@ jobs: distribution: 'zulu' java-version: '11' - name: Create custom Maven Settings.xml - uses: whelk-io/maven-settings-xml-action@v18 + uses: whelk-io/maven-settings-xml-action@v20 with: output_file: custom_maven_settings.xml servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]' diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml index e6537ab5..a9e41cd4 100644 --- a/.github/workflows/release-project.yml +++ b/.github/workflows/release-project.yml @@ -30,7 +30,7 @@ jobs: distribution: 'zulu' java-version: '11' - name: Create custom Maven Settings.xml - uses: whelk-io/maven-settings-xml-action@v18 + uses: whelk-io/maven-settings-xml-action@v20 with: output_file: custom_maven_settings.xml servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]' diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml index c72a9d94..3a3eeba3 100644 --- a/.github/workflows/sonarcloud-analysis.yml +++ b/.github/workflows/sonarcloud-analysis.yml @@ -34,7 +34,7 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - name: Create custom Maven Settings.xml - uses: whelk-io/maven-settings-xml-action@v18 + uses: whelk-io/maven-settings-xml-action@v20 with: output_file: custom_maven_settings.xml servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'