diff --git a/.github/workflows/Deploy-docker.yml b/.github/workflows/Deploy-docker.yml index 6317fcf..232ed78 100644 --- a/.github/workflows/Deploy-docker.yml +++ b/.github/workflows/Deploy-docker.yml @@ -12,18 +12,19 @@ jobs: runs-on: ubuntu-latest - env: - JWT_SECRET: ${{secrets.jwt_secret}} - POSTGRES_HOST: 192.168.1.200 - POSTGRES_PORT: 5099 - POSTGRES_USER: postgres - POSTGRES_DB: portfolio - POSTGRES_PASSWORD: ${{secrets.database_password}} - SSL_MODE: true - ENVIRONMENT: docker - steps: - uses: actions/checkout@v3 + - name: 'Create env file' + run: | + touch .env + echo JWT_SECRET=${{secrets.jwt_secret}} >> .env + echo POSTGRES_HOST=192.168.1.200 >> .env + echo POSTGRES_PORT=5099 >> .env + echo POSTGRES_USER=portfolio >> .env + echo POSTGRES_DB=${{secrets.database_password}} >> .env + echo POSTGRES_PASSWORD=true >> .env + echo SSL_MODE=${{ secrets.API_KEY }} >> .env + echo ENVIRONMENT=docker >> .env - name: Build the Docker image run: docker compose build - name: Docker login diff --git a/docker-compose.yml b/docker-compose.yml index ecaeafd..5356f09 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,15 +4,8 @@ services: portfolio: container_name: darius-portfolio-server build: . - environment: - - JWT_SECRET - - POSTGRES_HOST - - POSTGRES_PORT - - POSTGRES_USER - - POSTGRES_DB - - POSTGRES_PASSWORD - - SSL_MODE - - ENVIRONMENT + env_file: + - .env ports: - "4000:4000" - "4001:4001" diff --git a/main.go b/main.go index 80c3502..a4d40f0 100644 --- a/main.go +++ b/main.go @@ -12,6 +12,7 @@ import ( ) func main() { + println(os.Getenv("ENVIRONMENT")) // load .env in runtime environment if os.Getenv("ENVIRONMENT") != "docker" { err := godotenv.Load()