diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 88f1046..5b7c6b7 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -20,12 +20,12 @@ jobs: script: | set -e cd ${{ vars.DEPLOY_PATH }} - if [ ! -d .git ]; then - git init - git remote add origin git@gitea.hmac.kr:b24014/kngil_home.git - else - git remote set-url origin git@gitea.hmac.kr:b24014/kngil_home.git - fi + # if [ ! -d .git ]; then + # git init + # git remote add origin ssh://git@127.0.0.1:222/b24014/kngil_home.git + # else + # git remote set-url origin ssh://git@127.0.0.1:222/b24014/kngil_home.git + # fi cat << 'ENVEOF' > .env WEB_HOST_PORT=${{ vars.WEB_HOST_PORT }} DB_HOST=${{ vars.DB_HOST }} @@ -42,7 +42,6 @@ jobs: IDP_SERVICE_URL=${{ vars.IDP_SERVICE_URL }} ENVEOF - # Export variables from .env file set -a source .env diff --git a/docker-compose.yml b/docker-compose.yml index 4685060..7e91d19 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ services: web: build: . ports: - - "8080:80" + - "${WEB_HOST_PORT:-8080}:80" volumes: - ./:/var/www/html environment: @@ -17,6 +17,7 @@ services: OIDC_REDIRECT_URL: ${OIDC_REDIRECT_URL:-} OIDC_SCOPES: ${OIDC_SCOPES:-} IDP_SERVICE_URL: ${IDP_SERVICE_URL:-} + restart: always depends_on: - db @@ -38,6 +39,7 @@ services: - db_data:/var/lib/postgresql/data - ./docker/initdb/01_kngil_DB.sql:/docker-entrypoint-initdb.d/01_kngil_DB.sql:ro - ./docker/postgres/pg_hba.conf:/etc/postgresql/pg_hba.conf:ro + restart: always volumes: db_data: