.dockerignore

@@ -1,4 +0,0 @@
-.dockerignore
-docker-bake.hcl
-docker-compose.yml
-Dockerfile

.gitignore

@@ -3,5 +3,3 @@
 
 /target
 /out
-
-/docker-data

Dockerfile

@@ -1,22 +0,0 @@
-FROM rust:1 as builder
-
-RUN rustup target add x86_64-unknown-linux-musl && \
-    apt update && \
-    apt install -y musl-tools musl-dev && \
-    update-ca-certificates
-
-COPY ./ /emgauwa
-
-FROM builder as builder-core
-WORKDIR /emgauwa/core
-RUN cargo build --target x86_64-unknown-linux-musl --release
-
-FROM builder as builder-controller
-WORKDIR /emgauwa/controller
-RUN cargo build --target x86_64-unknown-linux-musl --release
-
-FROM scratch
-COPY --from=builder-core /emgauwa/core/target/x86_64-unknown-linux-musl/release/emgauwa-core /usr/bin/emgauwa-core
-COPY --from=builder-controller /emgauwa/controller/target/x86_64-unknown-linux-musl/release/emgauwa-controller /usr/bin/emgauwa-controller
-
-CMD ["echo", "please specify command /usr/bin/emgauwa-core or /usr/bin/emgauwa-controller"]

Makefile

@@ -7,16 +7,3 @@ git-status:
 
 git-diff:
 	git diff --submodule=diff
-
-cargo-all:
-	cd common && cargo $(ACTION)
-	cd controller && cargo $(ACTION)
-	cd core && cargo $(ACTION)
-cargo-build:
-	$(MAKE) ACTION=build cargo-all
-cargo-update:
-	$(MAKE) ACTION=update cargo-all
-
-docker-bake:
-	cd controller && docker builder bake
-	cd core && docker builder bake

common

@@ -1 +1 @@
-Subproject commit 066e9f7bf8e9379b22ccfc6ab7c3f18013fa561f
+Subproject commit 41cc9e0622b69868eb13db843b1323337cb7a544

controller

@@ -1 +1 @@
-Subproject commit 83440bdb8f9b1fd7a75fda7f4a16833dd6624668
+Subproject commit 5ee542b44b3c7f1d1d59a4dfe7cb0679d44e0f3f

core

@@ -1 +1 @@
-Subproject commit 892786d2f39550183b99859bcc20569b26f8c3a6
+Subproject commit 0b74f358d578c10b2c8da670293da37f0ffe30e4

docker-bake.hcl

@@ -1,15 +0,0 @@
-variable "REG" {
-    default = "registry.serguzim.me"
-}
-variable "REPO" {
-    default = "emgauwa/combi"
-}
-variable "TAG" {
-    default = "latest"
-}
-
-target "default" {
-    output = ["type=docker"]
-    dockerfile = "./Dockerfile"
-    tags = ["${REG}/${REPO}:latest", "${REG}/${REPO}:${TAG}"]
-}

docker-compose.yml

@@ -1,29 +0,0 @@
-services:
-  core:
-    image: registry.serguzim.me/emgauwa/combi
-    command: /usr/bin/emgauwa-core
-    ports:
-      - "4419:4419"
-    environment:
-      EMGAUWA_CORE__SERVER__HOST: 0.0.0.0
-      EMGAUWA_CORE__DATABASE: sqlite:///data/core.sqlite
-    volumes:
-      - ./docker-data:/data
-  controller1:
-    image: registry.serguzim.me/emgauwa/combi
-    command: /usr/bin/emgauwa-controller
-    environment:
-      EMGAUWA_CONTROLLER__SERVER__HOST: core
-      EMGAUWA_CONTROLLER__DATABASE: sqlite:///data/controller1.sqlite
-    volumes:
-      - ./controller/emgauwa-controller.json:/etc/emgauwa/controller.json
-      - ./docker-data:/data
-  controller2:
-    image: registry.serguzim.me/emgauwa/combi
-    command: /usr/bin/emgauwa-controller
-    environment:
-      EMGAUWA_CONTROLLER__SERVER__HOST: core
-      EMGAUWA_CONTROLLER__DATABASE: sqlite:///data/controller2.sqlite
-    volumes:
-      - ./controller/emgauwa-controller.json:/etc/emgauwa/controller.json
-      - ./docker-data:/data