Compare commits

..

6 commits

Author SHA1 Message Date
4ce49cb68f ci: Add build steps for the ui before building the oci image
All checks were successful
ci/woodpecker/manual/java/1 Pipeline was successful
ci/woodpecker/manual/java/2 Pipeline was successful
ci/woodpecker/manual/java/3 Pipeline was successful
ci/woodpecker/manual/java/4 Pipeline was successful
ci/woodpecker/manual/nodejs Pipeline was successful
ci/woodpecker/manual/oci-image-build/1 Pipeline was successful
ci/woodpecker/manual/oci-image-build/2 Pipeline was successful
ci/woodpecker/manual/oci-image-build/3 Pipeline was successful
ci/woodpecker/manual/oci-image-build/4 Pipeline was successful
ci/woodpecker/manual/oci-image-build/5 Pipeline was successful
ci/woodpecker/manual/oci-image-build/6 Pipeline was successful
ci/woodpecker/manual/oci-image-build/7 Pipeline was successful
ci/woodpecker/manual/oci-image-build/8 Pipeline was successful
2023-12-08 00:08:40 +01:00
f0e7038a05 ci: Refactor java steps into one file 2023-12-08 00:03:27 +01:00
97d2c80f85 ci: Add build steps befor oci-image-build steps 2023-12-07 23:45:21 +01:00
09bebecd9f ci: Add compile steps before test steps 2023-12-07 23:42:01 +01:00
3a03657b1c ci: Rename oci image build step file
This is to enable a previous build out side of the container context.
2023-12-07 23:34:37 +01:00
e3ba53fa70 misc: Add network isolation between docker compose services 2023-12-07 23:32:21 +01:00
5 changed files with 54 additions and 14 deletions

26
.woodpecker/java.yml Normal file
View file

@ -0,0 +1,26 @@
matrix:
MODULE:
- db
- bot
- web
- migration
variables:
- &image 'docker.io/maven:3.9-eclipse-temurin-21'
steps:
compile:
image: *image
group: compile
commands:
- mvn --batch-mode --no-transfer-progress -pl ${MODULE} -am compile
test:
image: *image
group: test
commands:
- mvn --batch-mode --no-transfer-progress -pl ${MODULE} -am test
build:
image: *image
group: build
commands:
- mvn --batch-mode --no-transfer-progress -Dmaven.test.skip -pl ${MODULE} -am install

7
.woodpecker/nodejs.yml Normal file
View file

@ -0,0 +1,7 @@
steps:
build:
image: docker.io/node:18-alpine
directory: ui
commands:
- npm ci
- npm run build

View file

@ -12,7 +12,8 @@ labels:
platform: linux/amd64 platform: linux/amd64
depends_on: depends_on:
- test - java
- nodejs
steps: steps:
build-only: build-only:

View file

@ -1,13 +0,0 @@
matrix:
MODULE:
- db
- bot
- web
- migration
steps:
test:
image: docker.io/maven:3.9-eclipse-temurin-21
group: test
commands:
- mvn --batch-mode --no-transfer-progress -pl ${MODULE} -am test

View file

@ -10,6 +10,8 @@ services:
context: . context: .
target: bot target: bot
restart: unless-stopped restart: unless-stopped
networks:
- db
user: 1000:1000 user: 1000:1000
depends_on: depends_on:
- db - db
@ -32,6 +34,9 @@ services:
- migration - migration
ports: ports:
- 8080:8080 - 8080:8080
networks:
- db
- web
migration: migration:
image: git.hhhammer.de/hamburghammer/dchat/migration:latest image: git.hhhammer.de/hamburghammer/dchat/migration:latest
@ -44,6 +49,8 @@ services:
user: 1000:1000 user: 1000:1000
depends_on: depends_on:
- db - db
networks:
- db
ui: ui:
image: git.hhhammer.de/hamburghammer/dchat/ui:latest image: git.hhhammer.de/hamburghammer/dchat/ui:latest
@ -54,6 +61,8 @@ services:
user: 1000:1000 user: 1000:1000
ports: ports:
- 8081:8080 - 8081:8080
networks:
- ui
caddy: caddy:
image: git.hhhammer.de/hamburghammer/dchat/caddy:latest image: git.hhhammer.de/hamburghammer/dchat/caddy:latest
@ -67,6 +76,9 @@ services:
- web - web
ports: ports:
- 8081:8080 - 8081:8080
networks:
- ui
- web
volumes: volumes:
- caddy_config:/config - caddy_config:/config
@ -77,6 +89,8 @@ services:
restart: unless-stopped restart: unless-stopped
ports: ports:
- 127.0.0.1:5432:5432 - 127.0.0.1:5432:5432
networks:
- db
volumes: volumes:
- ./data/postgres:/var/lib/postgresql/data:rw - ./data/postgres:/var/lib/postgresql/data:rw
healthcheck: healthcheck:
@ -88,3 +102,8 @@ services:
volumes: volumes:
caddy_config: caddy_config:
networks:
db:
ui:
web: