diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 9299d16..0000000 --- a/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -.dockerignore -docker-bake.hcl -docker-compose.yml -Dockerfile diff --git a/.gitignore b/.gitignore index 68f8678..95e4256 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,3 @@ /target /out - -/docker-data diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 022a25b..0000000 --- a/Dockerfile +++ /dev/null @@ -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"] diff --git a/Makefile b/Makefile index 5bf6cf3..f6c0284 100644 --- a/Makefile +++ b/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 diff --git a/common b/common index 066e9f7..41cc9e0 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 066e9f7bf8e9379b22ccfc6ab7c3f18013fa561f +Subproject commit 41cc9e0622b69868eb13db843b1323337cb7a544 diff --git a/controller b/controller index 83440bd..5ee542b 160000 --- a/controller +++ b/controller @@ -1 +1 @@ -Subproject commit 83440bdb8f9b1fd7a75fda7f4a16833dd6624668 +Subproject commit 5ee542b44b3c7f1d1d59a4dfe7cb0679d44e0f3f diff --git a/core b/core index 892786d..0b74f35 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 892786d2f39550183b99859bcc20569b26f8c3a6 +Subproject commit 0b74f358d578c10b2c8da670293da37f0ffe30e4 diff --git a/docker-bake.hcl b/docker-bake.hcl deleted file mode 100644 index a571888..0000000 --- a/docker-bake.hcl +++ /dev/null @@ -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}"] -} diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 5df8273..0000000 --- a/docker-compose.yml +++ /dev/null @@ -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