From 995ed5f8a2d6345ea25b7942d33a0efd2ae6cda0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magnus=20Le=C3=9Fmann=20=28=40MarkL4YG=29?= Date: Mon, 21 Apr 2025 11:04:21 +0200 Subject: [PATCH 1/3] ci: Remove no longer supported PR parameter --- .forgejo/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index c7c0d8c..d82f092 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -28,5 +28,3 @@ jobs: - uses: https://github.com/gradle/actions/setup-gradle@v4 - name: Build gradle project run: ./gradlew build - env: - ORG_GRADLE_PROJECT_SPRING_DEBUG: ${{ fromJSON(steps.pr-env.outputs.result).SPRING_DEBUG }} From 7def9ba4f1762a7536d8b70e42f69537449eec2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magnus=20Le=C3=9Fmann=20=28=40MarkL4YG=29?= Date: Mon, 21 Apr 2025 11:05:00 +0200 Subject: [PATCH 2/3] ci: Apply discovered options to formatting too --- .forgejo/workflows/formatting.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.forgejo/workflows/formatting.yml b/.forgejo/workflows/formatting.yml index d74a785..caabe0b 100644 --- a/.forgejo/workflows/formatting.yml +++ b/.forgejo/workflows/formatting.yml @@ -9,6 +9,11 @@ concurrency: cancel-in-progress: true group: ${{ github.workflow }}-${{ github.ref }} +env: + HTTP_PROXY: http://6.fsn1-1.forsaken-ashbirds.net:8888 + HTTPS_PROXY: http://6.fsn1-1.forsaken-ashbirds.net:8888 + GRADLE_OPTS: -Dhttp.proxyHost=6.fsn1-1.forsaken-ashbirds.net -Dhttp.proxyPort=8888 -Dhttps.proxyHost=6.fsn1-1.forsaken-ashbirds.net -Dhttps.proxyPort=8888 + jobs: check-formatting: runs-on: ubuntu-24.04 From 39164401e678ba12989d70429c25f12e658af13d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magnus=20Le=C3=9Fmann=20=28=40MarkL4YG=29?= Date: Mon, 21 Apr 2025 11:30:29 +0200 Subject: [PATCH 3/3] ci: Create Dockerfile to build a basic container image --- Dockerfile | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..1eb5b2a --- /dev/null +++ b/Dockerfile @@ -0,0 +1,31 @@ +FROM node:22 AS fe-build + +RUN mkdir /mnt/workspace +WORKDIR /mnt/workspace + +COPY ./frontend /mnt/workspace + +RUN npm install --global pnpm \ + && pnpm install \ + && pnpm run build \ + +FROM gradle AS be-build + +RUN mkdir /mnt/workspace +WORKDIR /mnt/workspace + +COPY --exclude=./frontend . ./mnt/workspace + +RUN ./gradlew -x test build + +FROM eclipse-temurin:21-jre-nanoserver + +ENV USE_SYSTEM_CA_CERTS=1 + +RUN mkdir /opt/home-cert-assistant +WORKDIR /opt/home-cert-assistant + +COPY --from=fe-build /mnt/workspace/dist /opt/home-cert-assistant/frontend +COPY --from=be-build /mnt/workspace/build/home-cert-assistant-0.0.1-SNAPSHOT.jar /opt/home-cert-assistant/ + +CMD ["java", "-jar", "/opt/home-cert-assistant/.jar"] \ No newline at end of file