.dockerignore

@@ -1,13 +0,0 @@
-*
-!db/src/
-!db/pom.xml
-!bot/src/
-!bot/pom.xml
-!migration/src/
-!migration/pom.xml
-!web/src/
-!web/pom.xml
-!pom.xml
-web/src/ui/node_modules
-web/src/ui/node
-web/src/ui/dist

.woodpecker/build-amd64.yml

@@ -11,29 +11,5 @@ pipeline:
         from_secret: docker_token
       dockerfile: Containerfile
       target: bot
-      repo: git.hhhammer.de/hamburghammer/dchat/bot
+      repo: git.hhhammer.de/hamburghammer/flyclt-deploy
-      tags: latest
-
-  build-web-amd64:
-    image: plugins/docker
-    settings:
-      registry: git.hhhammer.de
-      username: ci
-      password:
-        from_secret: docker_token
-      dockerfile: Containerfile
-      target: web
-      repo: git.hhhammer.de/hamburghammer/dchat/web
-      tags: latest
-
-  build-migration-amd64:
-    image: plugins/docker
-    settings:
-      registry: git.hhhammer.de
-      username: ci
-      password:
-        from_secret: docker_token
-      dockerfile: Containerfile
-      target: migration
-      repo: git.hhhammer.de/hamburghammer/dchat/migration
       tags: latest

.woodpecker/build-arm.yml

@@ -1,8 +1,8 @@
-platform: linux/amd64
+platform: linux/arm*
 # branch: main
 
 pipeline:
-  build-bot-arm64:
+  build-bot-arm:
     image: plugins/docker
     settings:
       registry: git.hhhammer.de
@@ -11,32 +11,5 @@ pipeline:
         from_secret: docker_token
       dockerfile: Containerfile
       target: bot
-      repo: git.hhhammer.de/hamburghammer/dchat/bot
+      repo: git.hhhammer.de/hamburghammer/flyclt-deploy
       tags: latest
-      platform: linux/arm64
-
-  build-web-arm64:
-    image: plugins/docker
-    settings:
-      registry: git.hhhammer.de
-      username: ci
-      password:
-        from_secret: docker_token
-      dockerfile: Containerfile
-      target: web
-      repo: git.hhhammer.de/hamburghammer/dchat/web
-      tags: latest
-      platform: linux/arm64
-
-  build-migration-arm64:
-    image: plugins/docker
-    settings:
-      registry: git.hhhammer.de
-      username: ci
-      password:
-        from_secret: docker_token
-      dockerfile: Containerfile
-      target: migration
-      repo: git.hhhammer.de/hamburghammer/dchat/migration
-      tags: latest
-      platform: linux/arm64

Containerfile

@@ -9,39 +9,39 @@ COPY migration/pom.xml migration/
 COPY web/pom.xml web/
 
 # Adding default Maven arguments
-ENV MAVEN_CLI_OPTS="--batch-mode --no-transfer-progress"
+ENV MAVEN_CLI_OPTS="--batch-mode"
 
 # Resolve dependencies for shared libraries
-RUN mvn $MAVEN_CLI_OPTS -pl db -am dependency:go-offline
+RUN mvn -pl db -am dependency:go-offline
 # Install the shared libraries in the local Maven repo (`.m2`)
 # This will also install the `root` module.
 COPY db db
-RUN mvn $MAVEN_CLI_OPTS -pl db -am install
+RUN mvn -pl db -am install
 # Resolve dependencies for modules without dependencies to each other
-RUN mvn $MAVEN_CLI_OPTS dependency:go-offline
+RUN mvn dependency:go-offline
 # Build modules
 COPY web web
-RUN mvn $MAVEN_CLI_OPTS -pl web package
+RUN mvn -pl web package
 COPY bot bot
-RUN mvn $MAVEN_CLI_OPTS -pl bot package
+RUN mvn -pl bot package
 COPY migration migration
-RUN mvn $MAVEN_CLI_OPTS -pl migration package
+RUN mvn -pl migration package
 
 # Stage 2: Create final web
-FROM docker.io/eclipse-temurin:19-jdk-jammy AS web
+FROM docker.io/eclipse-temurin:19-jdk-alpine AS web
 WORKDIR /app
 COPY --from=maven /app/web/target/web-*-fat.jar /app/web.jar
 EXPOSE 8080
 CMD ["java", "-jar", "/app/web.jar"]
 
 # Stage 2: Create final migration
-FROM docker.io/eclipse-temurin:19-jdk-jammy AS migration
+FROM docker.io/eclipse-temurin:19-jdk-alpine AS migration
 WORKDIR /app
 COPY --from=maven /app/migration/target/migration-*-fat.jar /app/migration.jar
 CMD ["java", "-jar", "/app/migration.jar"]
 
 # Stage 2: Create final bot
-FROM docker.io/eclipse-temurin:19-jdk-jammy AS bot
+FROM docker.io/eclipse-temurin:19-jdk-alpine AS bot
 WORKDIR /app
 COPY --from=maven /app/bot/target/bot-*-fat.jar /app/bot.jar
 CMD ["java", "-jar", "/app/bot.jar"]