From c420a5c1ebc8c37822ef79955d7ec5eed2f932a5 Mon Sep 17 00:00:00 2001 From: popenc Date: Mon, 21 Aug 2023 09:38:33 -0400 Subject: [PATCH] additional nginx build for non-epa kube deploys --- .github/workflows/docker-builds.yml | 33 +++++++++++++++++++++++++++++ docker/nginx/nginx-dev.conf | 8 +++++-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-builds.yml b/.github/workflows/docker-builds.yml index 185e5131..b4b24196 100644 --- a/.github/workflows/docker-builds.yml +++ b/.github/workflows/docker-builds.yml @@ -142,6 +142,39 @@ jobs: labels: ${{ steps.meta.outputs.labels }} build-args: config=nginx.conf + build-nginx-dev: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + needs: build-angular + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Log in to the Container registry + uses: docker/login-action@v1 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v4 + with: + images: ${{ env.REGISTRY }}/${{ env.NGINX_IMAGE }} + + - name: Build and push Cyanweb Nginx Docker image + uses: docker/build-push-action@v2 + with: + context: . + file: docker/nginx/Dockerfile + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + build-args: config=nginx-dev.conf + build-redis: runs-on: ubuntu-latest permissions: diff --git a/docker/nginx/nginx-dev.conf b/docker/nginx/nginx-dev.conf index 646522c2..bca78361 100644 --- a/docker/nginx/nginx-dev.conf +++ b/docker/nginx/nginx-dev.conf @@ -1,3 +1,7 @@ +############################################ +# Nginx for cyanweb dev/non-epa kube stack # +############################################ + upstream cyanweb_flask { server cyanweb-flask:5001; } @@ -15,12 +19,12 @@ server { # Cyano Backend API location /cyanweb/cyan/cyano { - proxy_pass https://ceamdev.ceeopdev.net/cyan/cyano; + proxy_pass https://cyan.epa.gov/cyan/cyano; } # Cyan-waterbody Backend API location /cyanweb/waterbody { - proxy_pass https://ceamdev.ceeopdev.net/waterbody; + proxy_pass https://cyan.epa.gov/waterbody; } # Cyanweb - prevents env.json caching: