From caa2ac21a15ef935c0d92a94567c1b0cc41268c9 Mon Sep 17 00:00:00 2001 From: core Date: Sun, 7 Apr 2024 14:04:41 -0400 Subject: [PATCH] dockerfiles --- .dockerignore | 6 +++++- .woodpecker/.backplane.yaml | 16 +++++++++++++++- .woodpecker/.client.yaml | 1 + .woodpecker/.server.yaml | 16 +++++++++++++++- server/Dockerfile | 8 ++++---- starkingdoms-backplane/Dockerfile | 5 +++++ starkingdoms-client/Dockerfile | 6 ++---- 7 files changed, 47 insertions(+), 11 deletions(-) create mode 100644 starkingdoms-backplane/Dockerfile diff --git a/.dockerignore b/.dockerignore index 1de565933b05f74c75ff9a6520af5f9f8a5a2f1d..589451e64895e0a125809df72fc972888b15ed2c 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1,5 @@ -target \ No newline at end of file +target/*/.fingerprint +target/*/build +target/*/deps +target/*/examples +target/*/incremental \ No newline at end of file diff --git a/.woodpecker/.backplane.yaml b/.woodpecker/.backplane.yaml index 8d9ef60672ac8a7d5f635608efa19fa4d965c282..65fc9d10dc55f366af1762c89ad5be09f852c34f 100644 --- a/.woodpecker/.backplane.yaml +++ b/.woodpecker/.backplane.yaml @@ -43,4 +43,18 @@ steps: from_secret: s3_id AWS_SECRET_ACCESS_KEY: from_secret: s3_key - RUSTC_WRAPPER: sccache \ No newline at end of file + RUSTC_WRAPPER: sccache + - name: build_image + depends_on: + - backplane_build + image: woodpeckerci/plugin-docker-buildx + settings: + repo: registry.gitlab.com/starkingdoms.tk/starkingdoms.tk/backplane + dockerfile: starkingdoms-backplane/Dockerfile + username: c0repwn3r + password: + from_secret: gitlab_token + tag: ${CI_COMMIT_TAG} + dry_run: true + when: + event: tag \ No newline at end of file diff --git a/.woodpecker/.client.yaml b/.woodpecker/.client.yaml index 34dbaa7dc8b5b3e87cad08e0300613d6c0bfdc56..1321e7567210cbaa1fae223c9efad7b9d85d8740 100644 --- a/.woodpecker/.client.yaml +++ b/.woodpecker/.client.yaml @@ -26,5 +26,6 @@ steps: password: from_secret: gitlab_token tag: ${CI_COMMIT_TAG} + dry_run: true when: event: tag \ No newline at end of file diff --git a/.woodpecker/.server.yaml b/.woodpecker/.server.yaml index 1b1091b9c951d0c4d22169823bb96a170df2de46..be76f17484416e4ceb62a6e6c9c5edfca890689d 100644 --- a/.woodpecker/.server.yaml +++ b/.woodpecker/.server.yaml @@ -46,4 +46,18 @@ steps: from_secret: s3_id AWS_SECRET_ACCESS_KEY: from_secret: s3_key - RUSTC_WRAPPER: sccache \ No newline at end of file + RUSTC_WRAPPER: sccache + - name: build_image + depends_on: + - server_build + image: woodpeckerci/plugin-docker-buildx + settings: + repo: registry.gitlab.com/starkingdoms.tk/starkingdoms.tk/server + dockerfile: server/Dockerfile + username: c0repwn3r + password: + from_secret: gitlab_token + tag: ${CI_COMMIT_TAG} + dry_run: true + when: + event: tag \ No newline at end of file diff --git a/server/Dockerfile b/server/Dockerfile index 1c887e7e0d8313a9afa9b472e6d39435da42bc3f..c18245df47f8c5876ea86ab3fe93cb49b12b86a9 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -1,6 +1,6 @@ -FROM rust:alpine +FROM debian:bookworm-slim -WORKDIR /build -COPY .. . +COPY target/release-ci/starkingdoms-server /bin/starkingdoms-server -RUN cargo build --profile release-ci \ No newline at end of file +EXPOSE 3000 +ENTRYPOINT ["starkingdoms-server"] \ No newline at end of file diff --git a/starkingdoms-backplane/Dockerfile b/starkingdoms-backplane/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..b1e87156584cccb588dc0cb8d1ecf7590c0e650e --- /dev/null +++ b/starkingdoms-backplane/Dockerfile @@ -0,0 +1,5 @@ +FROM debian:bookworm-slim + +COPY target/release-ci/starkingdoms-backplane /bin/starkingdoms-backplane + +ENTRYPOINT ["starkingdoms-backplane", "/etc/starkingdoms/backplane.toml"] \ No newline at end of file diff --git a/starkingdoms-client/Dockerfile b/starkingdoms-client/Dockerfile index 8cb960e1cb4fb360b8a39b9e765c31450c035f7a..a99cb9847b07426e3bac07a633df31eb4e7bed70 100644 --- a/starkingdoms-client/Dockerfile +++ b/starkingdoms-client/Dockerfile @@ -1,5 +1,3 @@ -FROM node:21-alpine +FROM nginx:alpine -COPY starkingdoms-client/dist . - -RUN cd dist && node . +COPY starkingdoms-client/dist /usr/share/nginx/html \ No newline at end of file