From 432c68ff747ade29fd085ef0b5b9c5a20389d639 Mon Sep 17 00:00:00 2001 From: xavo95 Date: Sun, 3 Nov 2024 00:27:17 +0100 Subject: [PATCH] Update docker --- Dockerfile-service | 2 +- builder.bat | 14 +++++++------- builder.sh | 14 +++++++------- docker-compose-hotpatch.yml | 8 ++++---- docker-compose.yml | 8 ++++---- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Dockerfile-service b/Dockerfile-service index 794f7b7..388aa9a 100644 --- a/Dockerfile-service +++ b/Dockerfile-service @@ -2,5 +2,5 @@ FROM alpine:3.20 ARG MICROSERVICE WORKDIR /app -COPY --from=wicked-waifus-builder:1.3.0-SNAPSHOT /app/target/release/$MICROSERVICE ./service +COPY --from=wicked-waifus-builder:1.4.0-SNAPSHOT /app/target/release/$MICROSERVICE ./service CMD ["./service"] \ No newline at end of file diff --git a/builder.bat b/builder.bat index 3c29524..524e4c6 100644 --- a/builder.bat +++ b/builder.bat @@ -1,12 +1,12 @@ -docker build -t wicked-waifus-builder:1.3.0-SNAPSHOT -f Dockerfile-builder . +docker build -t wicked-waifus-builder:1.4.0-SNAPSHOT -f Dockerfile-builder . -docker build -t wicked-waifus-config-server:1.3.0-SNAPSHOT --build-arg MICROSERVICE=config-server -f Dockerfile-service . -docker build -t wicked-waifus-hotpatch-server:1.3.0-SNAPSHOT --build-arg MICROSERVICE=hotpatch-server -f Dockerfile-service . -docker build -t wicked-waifus-login-server:1.3.0-SNAPSHOT --build-arg MICROSERVICE=login-server -f Dockerfile-service . -docker build -t wicked-waifus-gateway-server:1.3.0-SNAPSHOT --build-arg MICROSERVICE=gateway-server -f Dockerfile-service . -docker build -t wicked-waifus-game-server:1.3.0-SNAPSHOT --build-arg MICROSERVICE=game-server -f Dockerfile-service . +docker build -t wicked-waifus-config-server:1.4.0-SNAPSHOT --build-arg MICROSERVICE=config-server -f Dockerfile-service . +docker build -t wicked-waifus-hotpatch-server:1.4.0-SNAPSHOT --build-arg MICROSERVICE=hotpatch-server -f Dockerfile-service . +docker build -t wicked-waifus-login-server:1.4.0-SNAPSHOT --build-arg MICROSERVICE=login-server -f Dockerfile-service . +docker build -t wicked-waifus-gateway-server:1.4.0-SNAPSHOT --build-arg MICROSERVICE=gateway-server -f Dockerfile-service . +docker build -t wicked-waifus-game-server:1.4.0-SNAPSHOT --build-arg MICROSERVICE=game-server -f Dockerfile-service . -docker rmi wicked-waifus-builder:1.3.0-SNAPSHOT +docker rmi wicked-waifus-builder:1.4.0-SNAPSHOT : Persistence for the application : docker volume create wicked-waifus-postgres-vol \ No newline at end of file diff --git a/builder.sh b/builder.sh index b667dfa..c1ca30b 100644 --- a/builder.sh +++ b/builder.sh @@ -1,12 +1,12 @@ -docker build -t wicked-waifus-builder:1.3.0-SNAPSHOT -f Dockerfile-builder . +docker build -t wicked-waifus-builder:1.4.0-SNAPSHOT -f Dockerfile-builder . -docker build -t wicked-waifus-config-server:1.3.0-SNAPSHOT --build-arg MICROSERVICE=config-server -f Dockerfile-service . -docker build -t wicked-waifus-hotpatch-server:1.3.0-SNAPSHOT --build-arg MICROSERVICE=hotpatch-server -f Dockerfile-service . -docker build -t wicked-waifus-login-server:1.3.0-SNAPSHOT --build-arg MICROSERVICE=login-server -f Dockerfile-service . -docker build -t wicked-waifus-gateway-server:1.3.0-SNAPSHOT --build-arg MICROSERVICE=gateway-server -f Dockerfile-service . -docker build -t wicked-waifus-game-server:1.3.0-SNAPSHOT --build-arg MICROSERVICE=game-server -f Dockerfile-service . +docker build -t wicked-waifus-config-server:1.4.0-SNAPSHOT --build-arg MICROSERVICE=config-server -f Dockerfile-service . +docker build -t wicked-waifus-hotpatch-server:1.4.0-SNAPSHOT --build-arg MICROSERVICE=hotpatch-server -f Dockerfile-service . +docker build -t wicked-waifus-login-server:1.4.0-SNAPSHOT --build-arg MICROSERVICE=login-server -f Dockerfile-service . +docker build -t wicked-waifus-gateway-server:1.4.0-SNAPSHOT --build-arg MICROSERVICE=gateway-server -f Dockerfile-service . +docker build -t wicked-waifus-game-server:1.4.0-SNAPSHOT --build-arg MICROSERVICE=game-server -f Dockerfile-service . -docker rmi wicked-waifus-builder:1.3.0-SNAPSHOT +docker rmi wicked-waifus-builder:1.4.0-SNAPSHOT # Persistence for the application # docker volume create wicked-waifus-postgres-vol \ No newline at end of file diff --git a/docker-compose-hotpatch.yml b/docker-compose-hotpatch.yml index 1207b37..afea984 100644 --- a/docker-compose-hotpatch.yml +++ b/docker-compose-hotpatch.yml @@ -1,10 +1,10 @@ -name: camellya-ps +name: wicked-waifus-ps services: - camellya-hotpatch-server: - image: camellya-hotpatch-server:1.3.0-SNAPSHOT + wicked-waifus-hotpatch-server: + image: wicked-waifus-hotpatch-server:1.4.0-SNAPSHOT depends_on: - camellya-postgres: + wicked-waifus-postgres: condition: service_healthy ports: - '10002:10002' diff --git a/docker-compose.yml b/docker-compose.yml index 7f4842b..0877f96 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ name: wicked-waifus-ps services: wicked-waifus-config-server: - image: wicked-waifus-config-server:1.3.0-SNAPSHOT + image: wicked-waifus-config-server:1.4.0-SNAPSHOT depends_on: wicked-waifus-postgres: condition: service_healthy @@ -12,7 +12,7 @@ services: - "./docker/configserver.toml:/app/configserver.toml" - "./assets/config:/app/assets/config" wicked-waifus-login-server: - image: wicked-waifus-login-server:1.3.0-SNAPSHOT + image: wicked-waifus-login-server:1.4.0-SNAPSHOT depends_on: wicked-waifus-postgres: condition: service_healthy @@ -21,7 +21,7 @@ services: volumes: - "./docker/loginserver.toml:/app/loginserver.toml" wicked-waifus-gateway-server: - image: wicked-waifus-gateway-server:1.3.0-SNAPSHOT + image: wicked-waifus-gateway-server:1.4.0-SNAPSHOT depends_on: wicked-waifus-postgres: condition: service_healthy @@ -32,7 +32,7 @@ services: volumes: - "./docker/gateway.toml:/app/gateway.toml" wicked-waifus-game-server: - image: wicked-waifus-game-server:1.3.0-SNAPSHOT + image: wicked-waifus-game-server:1.4.0-SNAPSHOT depends_on: wicked-waifus-postgres: condition: service_healthy