refactor(workflow): use source_env_file and require_env_file from common-functions-base.sh

This commit is contained in:
Murat ÖZDEMİR 2026-06-26 14:01:46 +03:00
parent 6fc9ff45aa
commit c49616ac10
2 changed files with 22 additions and 14 deletions

View File

@ -45,17 +45,19 @@ jobs:
- name: Download Deploy Inputs - name: Download Deploy Inputs
run: | run: |
source ./common-functions-base.sh
export SPRING_PROFILES_ACTIVE=PROD
rm -f .env .env.secrets.swag rm -f .env .env.secrets.swag
scp -P 23 ${{ vars.STORAGEBOX_USER }}@${{ vars.STORAGEBOX_USER }}.your-storagebox.de:prod/secrets/iklim.co/.env ./.env scp -P 23 ${{ vars.STORAGEBOX_USER }}@${{ vars.STORAGEBOX_USER }}.your-storagebox.de:prod/secrets/iklim.co/.env ./.env
scp -P 23 ${{ vars.STORAGEBOX_USER }}@${{ vars.STORAGEBOX_USER }}.your-storagebox.de:prod/secrets/iklim.co/.env.secrets.swag ./.env.secrets.swag scp -P 23 ${{ vars.STORAGEBOX_USER }}@${{ vars.STORAGEBOX_USER }}.your-storagebox.de:prod/secrets/iklim.co/.env.secrets.swag ./.env.secrets.swag
test -s .env require_env_file ./.env "Main env file"
test -s .env.secrets.swag require_env_file ./.env.secrets.swag "SWAG secrets"
- name: Deploy Monitoring Stack - name: Deploy Monitoring Stack
run: | run: |
set -a; . ./.env; set +a source ./common-functions-base.sh
export IMAGE_LOKI="${IMAGE_LOKI}" export SPRING_PROFILES_ACTIVE=PROD
export IMAGE_PROMTAIL="${IMAGE_PROMTAIL}" source_env_file ./.env
# Remove leftover dozzle_users Docker secret from previous setup # Remove leftover dozzle_users Docker secret from previous setup
docker secret rm dozzle_users 2>/dev/null || true docker secret rm dozzle_users 2>/dev/null || true
@ -86,7 +88,8 @@ jobs:
run: | run: |
source ./common-functions-base.sh source ./common-functions-base.sh
export SPRING_PROFILES_ACTIVE=PROD export SPRING_PROFILES_ACTIVE=PROD
set -a; . ./.env; . ./.env.secrets.swag; set +a source_env_file ./.env
source_env_file ./.env.secrets.swag
export PORTAINER_SUBDOMAIN="${PORTAINER_SUBDOMAIN:-portainer.iklim.co}" export PORTAINER_SUBDOMAIN="${PORTAINER_SUBDOMAIN:-portainer.iklim.co}"
export RESTRICTED_IPS_BLOCK="$(echo "$RESTRICTED_IPS" | tr ',' '\n' | sed 's|.*| allow &;|')" export RESTRICTED_IPS_BLOCK="$(echo "$RESTRICTED_IPS" | tr ',' '\n' | sed 's|.*| allow &;|')"
@ -109,7 +112,8 @@ jobs:
run: | run: |
source ./common-functions-base.sh source ./common-functions-base.sh
export SPRING_PROFILES_ACTIVE=PROD export SPRING_PROFILES_ACTIVE=PROD
set -a; . ./.env; . ./.env.secrets.swag; set +a source_env_file ./.env
source_env_file ./.env.secrets.swag
FLOATING_IP="${{ vars.PROD_FLOATING_IP }}" FLOATING_IP="${{ vars.PROD_FLOATING_IP }}"
DOMAIN="iklim.co" DOMAIN="iklim.co"

View File

@ -41,17 +41,19 @@ jobs:
- name: Download Deploy Inputs - name: Download Deploy Inputs
run: | run: |
source ./common-functions-base.sh
export SPRING_PROFILES_ACTIVE=TEST
rm -f .env .env.secrets.swag rm -f .env .env.secrets.swag
scp -P 23 ${{ vars.STORAGEBOX_USER }}@${{ vars.STORAGEBOX_USER }}.your-storagebox.de:test/secrets/iklim.co/.env ./.env scp -P 23 ${{ vars.STORAGEBOX_USER }}@${{ vars.STORAGEBOX_USER }}.your-storagebox.de:test/secrets/iklim.co/.env ./.env
scp -P 23 ${{ vars.STORAGEBOX_USER }}@${{ vars.STORAGEBOX_USER }}.your-storagebox.de:test/secrets/iklim.co/.env.secrets.swag ./.env.secrets.swag scp -P 23 ${{ vars.STORAGEBOX_USER }}@${{ vars.STORAGEBOX_USER }}.your-storagebox.de:test/secrets/iklim.co/.env.secrets.swag ./.env.secrets.swag
test -s .env require_env_file ./.env "Main env file"
test -s .env.secrets.swag require_env_file ./.env.secrets.swag "SWAG secrets"
- name: Deploy Monitoring Stack - name: Deploy Monitoring Stack
run: | run: |
set -a; . ./.env; set +a source ./common-functions-base.sh
export IMAGE_LOKI="${IMAGE_LOKI}" export SPRING_PROFILES_ACTIVE=TEST
export IMAGE_PROMTAIL="${IMAGE_PROMTAIL}" source_env_file ./.env
docker stack deploy \ docker stack deploy \
--with-registry-auth \ --with-registry-auth \
@ -79,7 +81,8 @@ jobs:
run: | run: |
source ./common-functions-base.sh source ./common-functions-base.sh
export SPRING_PROFILES_ACTIVE=TEST export SPRING_PROFILES_ACTIVE=TEST
set -a; . ./.env; . ./.env.secrets.swag; set +a source_env_file ./.env
source_env_file ./.env.secrets.swag
export PORTAINER_SUBDOMAIN="${PORTAINER_SUBDOMAIN:-portainer-test.iklim.co}" export PORTAINER_SUBDOMAIN="${PORTAINER_SUBDOMAIN:-portainer-test.iklim.co}"
export RESTRICTED_IPS_BLOCK="$(echo "$RESTRICTED_IPS" | tr ',' '\n' | sed 's|.*| allow &;|')" export RESTRICTED_IPS_BLOCK="$(echo "$RESTRICTED_IPS" | tr ',' '\n' | sed 's|.*| allow &;|')"
@ -102,7 +105,8 @@ jobs:
run: | run: |
source ./common-functions-base.sh source ./common-functions-base.sh
export SPRING_PROFILES_ACTIVE=TEST export SPRING_PROFILES_ACTIVE=TEST
set -a; . ./.env; . ./.env.secrets.swag; set +a source_env_file ./.env
source_env_file ./.env.secrets.swag
FLOATING_IP="${{ vars.TEST_FLOATING_IP }}" FLOATING_IP="${{ vars.TEST_FLOATING_IP }}"
DOMAIN="iklim.co" DOMAIN="iklim.co"