Skip to content

Commit c415905

Browse files
author
Dennis Labordus
authored
Merge pull request #220 from com-pas/develop
New release
2 parents 82769ef + 430d547 commit c415905

File tree

13 files changed

+92
-30
lines changed

13 files changed

+92
-30
lines changed

‎.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,9 @@ updates:
3333
versions: [ "[3.0,)" ]
3434
- dependency-name: com.sun.xml.bind:jaxb-impl
3535
versions: [ "[3.0,)" ]
36+
37+
- package-ecosystem: "docker"
38+
directory: "/app/src/main/docker/"
39+
schedule:
40+
interval: "daily"
41+
open-pull-requests-limit: 5

‎.github/workflows/build-project.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/checkout@v3
2525
- name: Set up Docker Buildx
2626
id: buildx
27-
uses: docker/setup-buildx-action@v1
27+
uses: docker/setup-buildx-action@v2
2828
- name: Cache Docker Register
2929
uses: actions/cache@v3
3030
with:
@@ -48,9 +48,9 @@ jobs:
4848
with:
4949
output_file: custom_maven_settings.xml
5050
servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
51-
- name: Build Native with Maven
51+
- name: Build with Maven (Pull Request)
5252
if: ${{ github.event_name == 'pull_request' }}
53-
run: ./mvnw -s custom_maven_settings.xml -B -P native clean verify
54-
- name: Build with Maven
53+
run: ./mvnw -s custom_maven_settings.xml -B -Pnative-image clean verify
54+
- name: Build with Maven (Push)
5555
if: ${{ github.event_name == 'push' }}
5656
run: ./mvnw -s custom_maven_settings.xml -B clean verify

‎.github/workflows/release-project.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: Release Project
66

77
on:
88
release:
9-
types: [released]
9+
types: [ released ]
1010

1111
jobs:
1212
release_project:
@@ -19,9 +19,9 @@ jobs:
1919
uses: actions/checkout@v3
2020
- name: Set up Docker Buildx
2121
id: buildx
22-
uses: docker/setup-buildx-action@v1
22+
uses: docker/setup-buildx-action@v2
2323
- name: Login to Docker Hub
24-
uses: docker/login-action@v1
24+
uses: docker/login-action@v2
2525
with:
2626
username: ${{ secrets.DOCKER_HUB_USERNAME }}
2727
password: ${{ secrets.DOCKER_HUB_TOKEN }}
@@ -58,6 +58,6 @@ jobs:
5858
env:
5959
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6060
- name: Deploy with Maven to GitHub Packages and Docker Hub
61-
run: ./mvnw -B -s custom_maven_settings.xml -P release,native clean deploy
61+
run: ./mvnw -B -s custom_maven_settings.xml -Pnative-image,release clean deploy
6262
env:
6363
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/sonarcloud-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6060
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
6161
run: |
62-
./mvnw -s custom_maven_settings.xml -B -P sonar \
62+
./mvnw -s custom_maven_settings.xml -B -Psonar \
6363
-Dsonar.projectKey=com-pas_compas-scl-data-service \
6464
-Dsonar.organization=com-pas \
6565
-Dsonar.host.url=https://sonarcloud.io \

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0
77
[![Maven Build Github Action Status](<https://img.shields.io/github/workflow/status/com-pas/compas-scl-data-service/Maven%20Build?logo=GitHub>)](https://github.com/com-pas/compas-scl-data-service/actions?query=workflow%3A%22Maven+Build%22)
88
[![REUSE status](https://api.reuse.software/badge/github.com/com-pas/compas-scl-data-service)](https://api.reuse.software/info/github.com/com-pas/compas-scl-data-service)
99
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=com-pas_compas-scl-data-service&metric=alert_status)](https://sonarcloud.io/dashboard?id=com-pas_compas-scl-data-service)
10-
[![LFX Security Status](https://img.shields.io/badge/dynamic/json?color=orange&label=LFX%20Security%20Tool&query=issues%5B%3F%28%40%5B%27repository-name%27%5D%20%3D%3D%20%27compas-scl-data-service%27%29%5D%5B%27high-open-issues%27%5D&suffix=%20High%20open%20issues&url=https%3A%2F%2Fapi.security.lfx.linuxfoundation.org%2Fv1%2Fproject%2Fe8b6fdf9-2686-44c5-bbaa-6965d04ad3e1%2Fissues)](https://security.lfx.linuxfoundation.org/#/e8b6fdf9-2686-44c5-bbaa-6965d04ad3e1/issues)
10+
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5925/badge)](https://bestpractices.coreinfrastructure.org/projects/5925)
1111
[![Slack](https://raw.githubusercontent.com/com-pas/compas-architecture/master/public/LFEnergy-slack.svg)](http://lfenergy.slack.com/)
1212

1313
# compas-scl-data-service

‎app/pom.xml

Lines changed: 63 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,15 @@ SPDX-License-Identifier: Apache-2.0
163163
<configuration>
164164
<properties>
165165
<quarkus.profile>prod-postgresql</quarkus.profile>
166-
<quarkus.package.output-directory>postgresql-quarkus-app</quarkus.package.output-directory>
167-
<quarkus.docker.dockerfile-jvm-path>src/main/docker/Dockerfile-postgresql.jvm</quarkus.docker.dockerfile-jvm-path>
168-
<quarkus.docker.dockerfile-native-path>src/main/docker/Dockerfile-postgresql.native</quarkus.docker.dockerfile-native-path>
166+
<quarkus.package.output-directory>postgresql-quarkus-app
167+
</quarkus.package.output-directory>
168+
<quarkus.docker.dockerfile-jvm-path>src/main/docker/Dockerfile-postgresql.jvm
169+
</quarkus.docker.dockerfile-jvm-path>
170+
<quarkus.docker.dockerfile-native-path>src/main/docker/Dockerfile-postgresql.native
171+
</quarkus.docker.dockerfile-native-path>
169172
<quarkus.container-image.tag>${project.version}-postgresql</quarkus.container-image.tag>
170-
<quarkus.container-image.additional-tags>latest-postgresql</quarkus.container-image.additional-tags>
173+
<quarkus.container-image.additional-tags>latest-postgresql
174+
</quarkus.container-image.additional-tags>
171175
</properties>
172176
</configuration>
173177
</execution>
@@ -184,10 +188,13 @@ SPDX-License-Identifier: Apache-2.0
184188
<properties>
185189
<quarkus.profile>prod-basex</quarkus.profile>
186190
<quarkus.package.output-directory>basex-quarkus-app</quarkus.package.output-directory>
187-
<quarkus.docker.dockerfile-jvm-path>src/main/docker/Dockerfile-basex.jvm</quarkus.docker.dockerfile-jvm-path>
188-
<quarkus.docker.dockerfile-native-path>src/main/docker/Dockerfile-basex.native</quarkus.docker.dockerfile-native-path>
191+
<quarkus.docker.dockerfile-jvm-path>src/main/docker/Dockerfile-basex.jvm
192+
</quarkus.docker.dockerfile-jvm-path>
193+
<quarkus.docker.dockerfile-native-path>src/main/docker/Dockerfile-basex.native
194+
</quarkus.docker.dockerfile-native-path>
189195
<quarkus.container-image.tag>${project.version}-basex</quarkus.container-image.tag>
190-
<quarkus.container-image.additional-tags>latest-basex</quarkus.container-image.additional-tags>
196+
<quarkus.container-image.additional-tags>latest-basex
197+
</quarkus.container-image.additional-tags>
191198
</properties>
192199
</configuration>
193200
</execution>
@@ -209,12 +216,50 @@ SPDX-License-Identifier: Apache-2.0
209216

210217
<profiles>
211218
<profile>
212-
<id>native</id>
219+
<id>jvm-image</id>
213220

214221
<properties>
222+
<!-- Make a Docker Image, so the integration tests will be executed against the container -->
223+
<quarkus.container-image.build>true</quarkus.container-image.build>
224+
</properties>
225+
226+
<build>
227+
<plugins>
228+
<plugin>
229+
<groupId>org.apache.maven.plugins</groupId>
230+
<artifactId>maven-failsafe-plugin</artifactId>
231+
<version>${surefire-plugin.version}</version>
232+
<executions>
233+
<execution>
234+
<goals>
235+
<goal>integration-test</goal>
236+
<goal>verify</goal>
237+
</goals>
238+
<configuration>
239+
<systemPropertyVariables>
240+
<java.util.logging.manager>
241+
org.jboss.logmanager.LogManager
242+
</java.util.logging.manager>
243+
<maven.home>${maven.home}</maven.home>
244+
</systemPropertyVariables>
245+
</configuration>
246+
</execution>
247+
</executions>
248+
</plugin>
249+
</plugins>
250+
</build>
251+
</profile>
252+
253+
<profile>
254+
<id>native-image</id>
255+
256+
<properties>
257+
<!-- Make a Docker Image, so the integration tests will be executed against the container -->
258+
<quarkus.container-image.build>true</quarkus.container-image.build>
259+
215260
<quarkus.package.type>native</quarkus.package.type>
216-
<quarkus.native.container-build>true</quarkus.native.container-build> <!-- Allows for creating a Linux executable without GraalVM being installed -->
217-
<quarkus.container-image.build>true</quarkus.container-image.build> <!-- Also make a Docker Image, so the native test will be executed against the container -->
261+
<!-- Allows for creating a Linux executable without GraalVM being installed -->
262+
<quarkus.native.container-build>true</quarkus.native.container-build>
218263
</properties>
219264

220265
<build>
@@ -232,8 +277,11 @@ SPDX-License-Identifier: Apache-2.0
232277
</goals>
233278
<configuration>
234279
<systemPropertyVariables>
235-
<native.image.path>${project.build.directory}/basex-quarkus-app/${project.build.finalName}-runner</native.image.path>
236-
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
280+
<native.image.path>
281+
${project.build.directory}/basex-quarkus-app/${project.build.finalName}-runner
282+
</native.image.path>
283+
<java.util.logging.manager>org.jboss.logmanager.LogManager
284+
</java.util.logging.manager>
237285
<maven.home>${maven.home}</maven.home>
238286
</systemPropertyVariables>
239287
</configuration>
@@ -259,8 +307,10 @@ SPDX-License-Identifier: Apache-2.0
259307
<id>release</id>
260308

261309
<properties>
262-
<!-- Properties only used for publishing a native docker image (default to Docker Hub) -->
310+
<!-- Make a Docker Image from the component -->
263311
<quarkus.container-image.build>true</quarkus.container-image.build>
312+
313+
<!-- Properties only used for publishing a native docker image (default to Docker Hub) -->
264314
<quarkus.container-image.push>true</quarkus.container-image.push>
265315
</properties>
266316
</profile>

‎app/src/main/docker/Dockerfile-basex.jvm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/app-jvm
2222
#
2323
###
24-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4
24+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6
2525

2626
ARG JAVA_PACKAGE=java-11-openjdk-headless
2727
ARG RUN_JAVA_VERSION=1.3.8

‎app/src/main/docker/Dockerfile-basex.native

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# docker run -i --rm -p 8080:8080 quarkus/app
1515
#
1616
###
17-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4
17+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6
1818
WORKDIR /work/
1919
RUN chown 1001 /work \
2020
&& chmod "g+rwX" /work \

‎app/src/main/docker/Dockerfile-postgresql.jvm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/app-jvm
2222
#
2323
###
24-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4
24+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6
2525

2626
ARG JAVA_PACKAGE=java-11-openjdk-headless
2727
ARG RUN_JAVA_VERSION=1.3.8

‎app/src/main/docker/Dockerfile-postgresql.native

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# docker run -i --rm -p 8080:8080 quarkus/app
1515
#
1616
###
17-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4
17+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6
1818
WORKDIR /work/
1919
RUN chown 1001 /work \
2020
&& chmod "g+rwX" /work \

0 commit comments

Comments
 (0)