From aec4afe1419be48241788396bba7d99c62279b12 Mon Sep 17 00:00:00 2001 From: c0repwn3r Date: Fri, 21 Apr 2023 09:35:40 -0400 Subject: [PATCH] fix running and better builds --- api.Dockerfile | 2 +- server.Dockerfile | 2 +- spacetime | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/api.Dockerfile b/api.Dockerfile index b3e80689e56cc563bd1f6c990dffa775dba1572b..a514ed4354aea7fe82f5ae7e6b4864a22d90c82d 100644 --- a/api.Dockerfile +++ b/api.Dockerfile @@ -1,6 +1,6 @@ FROM buildpack-deps:bookworm -RUN apt-get update -yqq && apt-get install -yqq libssl3 +RUN apt-get update -yqq && apt-get install -yqq libssl3 libssl1.1 COPY target/release/starkingdoms-api /bin/starkingdoms-api diff --git a/server.Dockerfile b/server.Dockerfile index 79e770a85940249f17a57f0af2ce61c753f0bc83..cbcb0edcab57857d47def9a1fc8fa38111fb4918 100644 --- a/server.Dockerfile +++ b/server.Dockerfile @@ -1,6 +1,6 @@ FROM buildpack-deps:bookworm -RUN apt-get update -yqq && apt-get install -yqq libssl3 +RUN apt-get update -yqq && apt-get install -yqq libssl3 libssl1.1 COPY target/release/starkingdoms-server /bin/starkingdoms-server diff --git a/spacetime b/spacetime index cdc4672c1feaaa9fbc3905348609be320e842989..db84fd5ac65d65a68976b217be6f300a9784313b 100755 --- a/spacetime +++ b/spacetime @@ -69,13 +69,17 @@ check_all() { sub_build_docker_api() { cargo build --release --bin starkingdoms-api docker buildx build -f api.Dockerfile -t registry.gitlab.com/starkingdoms.tk/starkingdoms.tk:api-$(git rev-parse --short HEAD) . + docker buildx build -f api.Dockerfile -t registry.gitlab.com/starkingdoms.tk/starkingdoms.tk:api-bleeding . docker push registry.gitlab.com/starkingdoms.tk/starkingdoms.tk:api-$(git rev-parse --short HEAD) + docker push registry.gitlab.com/starkingdoms.tk/starkingdoms.tk:api-bleeding } sub_build_docker_server() { cargo build --release --bin starkingdoms-server docker buildx build -f api.Dockerfile -t registry.gitlab.com/starkingdoms.tk/starkingdoms.tk:server-$(git rev-parse --short HEAD) . + docker buildx build -f api.Dockerfile -t registry.gitlab.com/starkingdoms.tk/starkingdoms.tk:server-bleeding . docker push registry.gitlab.com/starkingdoms.tk/starkingdoms.tk:server-$(git rev-parse --short HEAD) + docker push registry.gitlab.com/starkingdoms.tk/starkingdoms.tk:server-bleeding } sub_clean() {