Update docker stuff

This commit is contained in:
Tobias Reisinger 2026-09-03 12:51:30 +02:00
commit ff7f20f12c
Signed by: serguzim
GPG key ID: 13AD60C237A28DFE
4 changed files with 10 additions and 6 deletions

View file

@ -2,3 +2,7 @@
docker-bake.hcl docker-bake.hcl
docker-compose.yml docker-compose.yml
Dockerfile Dockerfile
common/target/
core/target/
controller/target/

View file

@ -1,4 +1,4 @@
FROM rust:1 as builder FROM rust:1 AS builder
RUN rustup target add x86_64-unknown-linux-musl && \ RUN rustup target add x86_64-unknown-linux-musl && \
apt update && \ apt update && \
@ -7,11 +7,11 @@ RUN rustup target add x86_64-unknown-linux-musl && \
COPY ./ /emgauwa COPY ./ /emgauwa
FROM builder as builder-core FROM builder AS builder-core
WORKDIR /emgauwa/core WORKDIR /emgauwa/core
RUN cargo build --target x86_64-unknown-linux-musl --release RUN cargo build --target x86_64-unknown-linux-musl --release
FROM builder as builder-controller FROM builder AS builder-controller
WORKDIR /emgauwa/controller WORKDIR /emgauwa/controller
RUN cargo build --target x86_64-unknown-linux-musl --release RUN cargo build --target x86_64-unknown-linux-musl --release

View file

@ -1,5 +1,5 @@
variable "REG" { variable "REG" {
default = "registry.serguzim.me" default = "rg.nl-ams.scw.cloud/public.serguzim.net"
} }
variable "REPO" { variable "REPO" {
default = "emgauwa/combi" default = "emgauwa/combi"

View file

@ -16,7 +16,7 @@ services:
EMGAUWA_CONTROLLER__SERVER__HOST: core EMGAUWA_CONTROLLER__SERVER__HOST: core
EMGAUWA_CONTROLLER__DATABASE: sqlite:///data/controller1.sqlite EMGAUWA_CONTROLLER__DATABASE: sqlite:///data/controller1.sqlite
volumes: volumes:
- ./controller/emgauwa-controller.json:/etc/emgauwa/controller.json - ./controller/emgauwa-controller.cfg:/etc/emgauwa/controller.cfg
- ./docker-data:/data - ./docker-data:/data
controller2: controller2:
image: registry.serguzim.me/emgauwa/combi image: registry.serguzim.me/emgauwa/combi
@ -25,5 +25,5 @@ services:
EMGAUWA_CONTROLLER__SERVER__HOST: core EMGAUWA_CONTROLLER__SERVER__HOST: core
EMGAUWA_CONTROLLER__DATABASE: sqlite:///data/controller2.sqlite EMGAUWA_CONTROLLER__DATABASE: sqlite:///data/controller2.sqlite
volumes: volumes:
- ./controller/emgauwa-controller.json:/etc/emgauwa/controller.json - ./controller/emgauwa-controller.cfg:/etc/emgauwa/controller.cfg
- ./docker-data:/data - ./docker-data:/data