Migrate to K8S stack and fixes before big refactoring

This commit is contained in:
PB
2025-10-13 19:32:31 +02:00
parent ac19e766cf
commit 7f951cd42d
31 changed files with 163 additions and 470 deletions

13
deploy/.env.dist Normal file
View File

@@ -0,0 +1,13 @@
SERVER_ADDR=:443
APP_NAME=identity-svc
APP_DOMAIN=identity.service.ego.io
APP_PATH_PREFIX=/identity
API_LOGGER_ADDR=api-logger:24224
API_DATABASE_URL=postgres://postgres:12345678@db-postgres:5432/egommerce
API_CACHE_ADDR=api-cache:6379
API_CACHE_USERNAME=default
API_CACHE_PASSWORD=12345678
API_MONGODB_URL=mongodb://mongodb:12345678@mongo-db:27017
# EVENTBUS_URL=amqp://guest:guest@api-eventbus:5672

0
deploy/certs/.gitkeep Normal file
View File

View File

@@ -1,11 +1,11 @@
#!/bin/sh
# RUN IN REPO ROOT DIR !!
export IMAGE_PREFIX="git.pbiernat.io/egommerce/identity"
export IMAGE_PREFIX="git.ego.freeddns.org/egommerce/identity"
export BUILDER_IMAGE="egommerce-builder:identity"
export BUILD_TIME=$(date +"%Y%m%d%H%M%S")
export SERVER_IMAGE="$IMAGE_PREFIX-svc"
export DOCKER_BUILDKIT=1
# export DOCKER_BUILDKIT=1
TARGET=${1:-latest}
@@ -16,14 +16,25 @@ docker build --rm -t $BUILDER_IMAGE -f Dockerfile.builder .
if [ $TARGET = "latest" ]
then
# SERVER
docker build --build-arg SVC_NAME=identity-service --build-arg SVC_VER="1.0" --build-arg BIN_OUTPUT=/go/bin/server \
--build-arg BUILDER_IMAGE=$BUILDER_IMAGE --build-arg BUILD_TIME --rm --cache-from $SERVER_IMAGE:$TARGET -t $SERVER_IMAGE:$TARGET \
# PROD
docker build \
--build-arg SVC_NAME=identity-service \
--build-arg SVC_VER="1.0" \
--build-arg BIN_OUTPUT=/go/bin/server \
--build-arg BUILDER_IMAGE=$BUILDER_IMAGE \
--build-arg BUILD_TIME \
--rm --cache-from $SERVER_IMAGE:$TARGET \
-t $SERVER_IMAGE:$TARGET \
-f Dockerfile.target . >/dev/null 2>&1 && echo "Successfully tagged $SERVER_IMAGE:$TARGET"
else
# SERVER
docker build --build-arg SVC_NAME=identity-service --build-arg SVC_VER="dev" --build-arg BIN_OUTPUT=/go/bin/server \
--build-arg BUILDER_IMAGE=$BUILDER_IMAGE --build-arg BUILD_TIME --rm --no-cache -t $SERVER_IMAGE:$TARGET \
# DEV
docker build \
--build-arg SVC_NAME=identity-service \
--build-arg SVC_VER="dev" \
--build-arg BIN_OUTPUT=/go/bin/server \
--build-arg BUILDER_IMAGE=$BUILDER_IMAGE \
--build-arg BUILD_TIME \
--rm --no-cache -t $SERVER_IMAGE:$TARGET \
-f Dockerfile.target . >/dev/null 2>&1 && echo "Successfully tagged $SERVER_IMAGE:$TARGET"
fi

View File

@@ -1,16 +1,14 @@
#!/bin/sh
# RUN IN REPO ROOT DIR !!
export IMAGE_PREFIX="git.pbiernat.io/egommerce/identity"
export IMAGE_PREFIX="git.ego.freeddns.org/egommerce/identity"
export SERVER_IMAGE="$IMAGE_PREFIX-svc"
# export WORKER_IMAGE="$IMAGE_PREFIX-worker"
TARGET=${1:-latest}
echo $DOCKER_PASSWORD | docker login git.pbiernat.io -u $DOCKER_USERNAME --password-stdin
echo $DOCKER_PASSWORD | docker login git.ego.freeddns.org -u $DOCKER_USERNAME --password-stdin
docker push "$SERVER_IMAGE:$TARGET"
# docker push "$WORKER_IMAGE:$TARGET"
# Restart container
curl -X POST http://127.0.0.1:9001/api/webhooks/64ea5d78-ae21-474c-ad4d-1d98f6b83acb