diff --git a/.env-base b/.env-base index 659c0d9..510adcf 100644 --- a/.env-base +++ b/.env-base @@ -4,5 +4,6 @@ DOCKER_ROOT="$DOCKER_REPO/$DOCKER_GROUP" VERSION=$(grep -m 1 'version' ./pyproject.toml | grep -oP 'version\s*=\s*"\K[^"]+') PYTHON_VERSION=$(grep -m 1 'python' ./pyproject.toml | grep -oP 'python\s*=\s*"\^?\K[^"]+') DOCKER_PROJECTS=("gallery") +DOCKER_TAG=latest OPENWEATHER_KEY="" \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index 22a98b7..9bc4104 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,4 +1,4 @@ -name: gallery +name: gallery-${DOCKER_TAG} services: redis: @@ -9,7 +9,7 @@ services: - redis_data:/data app: container_name: gallery-app - image: ${DOCKER_ROOT}/gallery + image: ${DOCKER_ROOT}/gallery:${DOCKER_TAG} environment: - REDIS_HOST=redis - OPENWEATHER_KEY=$OPENWEATHER_KEY diff --git a/scripts/docker-action b/scripts/docker-action index 04f6a28..b3ba66c 100755 --- a/scripts/docker-action +++ b/scripts/docker-action @@ -29,9 +29,9 @@ publish () { for PROJECT in "${DOCKER_PROJECTS[@]}"; do IFS=: read -r PROJECT_NAME PROJECT_TARGET <<< "$PROJECT" docker tag $DOCKER_GROUP/$PROJECT_NAME $DOCKER_ROOT/$PROJECT_NAME:$VERSION - docker tag $DOCKER_GROUP/$PROJECT_NAME $DOCKER_ROOT/$PROJECT_NAME:latest + docker tag $DOCKER_GROUP/$PROJECT_NAME $DOCKER_ROOT/$PROJECT_NAME:$DOCKER_TAG docker push $DOCKER_ROOT/$PROJECT_NAME:$VERSION - docker push $DOCKER_ROOT/$PROJECT_NAME:latest + docker push $DOCKER_ROOT/$PROJECT_NAME:$DOCKER_TAG done }