CCCHH/sunders
3
0
Fork 1
forked from kamba4/sunders
Code Issues 4 Pull requests Packages 1 Activity Actions

added data_handeler container
All checks were successful
Build Hello World Image / build (push) Successful in 1m4s
Details

Browse source
This commit is contained in:
asohh 2025-10-12 17:35:28 +02:00
commit 522c609ef1
2 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.forgejo/workflows/images.yml
View file

@ -28,6 +28,11 @@ jobs:
docker build -f Containerfile -t git.hamburg.ccc.de/ccchh/sunders/web:latest . docker build -f Containerfile -t git.hamburg.ccc.de/ccchh/sunders/web:latest .
docker push git.hamburg.ccc.de/ccchh/sunders/web:latest docker push git.hamburg.ccc.de/ccchh/sunders/web:latest
- name: Build and push data_handler image to Container Registry
run: |
docker build -f Containerfile.data_handler -t git.hamburg.ccc.de/ccchh/sunders/data_handler:latest .
docker push git.hamburg.ccc.de/ccchh/sunders/data_handler:latest
- name: Start Docker Compose services - name: Start Docker Compose services
run: | run: |
docker compose up -d --wait docker compose up -d --wait

24
docker-compose.yml
View file

@ -13,6 +13,7 @@ services:
test: ["CMD", "mariadb-admin", "ping", "-h", "localhost", "-uroot", "-prootpassword"] test: ["CMD", "mariadb-admin", "ping", "-h", "localhost", "-uroot", "-prootpassword"]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
start_period: 30s
retries: 5 retries: 5
web: web:
@ -20,8 +21,8 @@ services:
environment: environment:
MYSQL_HOST: db MYSQL_HOST: db
MYSQL_DB: camera # ${{secrets.MYSQL_DATABASE}} MYSQL_DB: camera # ${{secrets.MYSQL_DATABASE}}
MYSQL_USER: camera # ${{secrets.MYSQL_USER}} MYSQL_USER: camera_select # ${{secrets.CAMERA_SELECT_USER}}
MYSQL_PASSWORD: camerapassword # ${{secrets.MYSQL_PASSWORD}} MYSQL_PASSWORD: camera_selectpassword # ${{secrets.CAMERA_SELECT_USER_PASSWORD}}
DEFAULT_ZOOM: 12 DEFAULT_ZOOM: 12
DEFAULT_LAT: 0 DEFAULT_LAT: 0
DEFAULT_LON: 0 DEFAULT_LON: 0
@ -29,4 +30,21 @@ services:
ports: ports:
- "8080:80" - "8080:80"
depends_on: depends_on:
- db data_handler:
condition: service_started
data_handler:
image: git.hamburg.ccc.de/ccchh/sunders/data_handler:latest
environment:
MYSQL_HOST: db
MYSQL_DB: camera # ${{secrets.MYSQL_DATABASE}}
MYSQL_USER: root # ${{secrets.MYSQL_USER}}
MYSQL_PASSWORD: rootpassword # ${{secrets.MYSQL_ROOT_PASSWORD}}
CAMERA_USER: camera # ${{secrets.CAMERA_USER}}
CAMERA_USER_PASSWORD: camerapassword # ${{secrets.CAMERA_USER_PASSWORD}}
CAMERA_SELECT_USER: camera_select # ${{secrets.CAMERA_SELECT_USER}}
CAMERA_SELECT_USER_PASSWORD: camera_selectpassword # ${{secrets.CAMERA_SELECT_USER_PASSWORD}}
depends_on:
db:
condition: service_healthy
restart: true