diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 64412da..543ce22 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -5,4 +5,10 @@ updates: schedule: interval: daily labels: - - dependencies \ No newline at end of file + - dependencies + - package-ecosystem: "docker" + directory: "/src/main/docker" + schedule: + interval: daily + labels: + - docker-image \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a0ea7e3..b781135 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,14 +6,6 @@ on: branches: - 'main' - 'fix/[0-9]+.[0-9]+.x' - paths-ignore: - - '.gitignore' - - 'CODEOWNERS' - - 'LICENSE' - - '*.md' - - '*.adoc' - - '*.txt' - - '.all-contributorsrc' jobs: build: diff --git a/.github/workflows/create-new-build.yml b/.github/workflows/create-new-build.yml new file mode 100644 index 0000000..1404492 --- /dev/null +++ b/.github/workflows/create-new-build.yml @@ -0,0 +1,9 @@ +name: Create new build + +on: + workflow_dispatch: + +jobs: + build: + uses: onecx/ci-common/.github/workflows/create-new-build.yml@v1 + secrets: inherit diff --git a/pom.xml b/pom.xml index f8417ce..12ecb8d 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.tkit.onecx onecx-quarkus3-parent - 0.31.0 + 0.32.0 onecx-announcement-bff diff --git a/src/main/docker/Dockerfile.jvm b/src/main/docker/Dockerfile.jvm index a554421..01c98fe 100644 --- a/src/main/docker/Dockerfile.jvm +++ b/src/main/docker/Dockerfile.jvm @@ -1,13 +1,7 @@ -FROM registry.access.redhat.com/ubi9/openjdk-17:1.15 - -ENV LANGUAGE='en_US:en' +FROM ghcr.io/onecx/docker-quarkus-jvm:0.4.0 COPY --chown=185 target/quarkus-app/lib/ /deployments/lib/ COPY --chown=185 target/quarkus-app/*.jar /deployments/ COPY --chown=185 target/quarkus-app/app/ /deployments/app/ COPY --chown=185 target/quarkus-app/quarkus/ /deployments/quarkus/ - -EXPOSE 8080 USER 185 -ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" -ENV JAVA_APP_JAR="/deployments/quarkus-run.jar" \ No newline at end of file diff --git a/src/main/docker/Dockerfile.native b/src/main/docker/Dockerfile.native index c97f217..c0ba5ed 100644 --- a/src/main/docker/Dockerfile.native +++ b/src/main/docker/Dockerfile.native @@ -1,11 +1,3 @@ -FROM registry.access.redhat.com/ubi9/ubi-minimal:9.2 -WORKDIR /work/ -RUN chown 1001 /work \ - && chmod "g+rwX" /work \ - && chown 1001:root /work -COPY --chown=1001:root target/*-runner /work/application - -EXPOSE 8080 -USER 1001 +FROM ghcr.io/onecx/docker-quarkus-native:0.2.0 -CMD ["./application", "-Dquarkus.http.host=0.0.0.0"] \ No newline at end of file +COPY --chown=1001:root target/*-runner /work/application