diff --git a/.github/workflows/deploy-test.yml b/.github/workflows/deploy-test.yml index f73977f..ad3bb07 100644 --- a/.github/workflows/deploy-test.yml +++ b/.github/workflows/deploy-test.yml @@ -21,6 +21,23 @@ jobs: - name: Checkout code uses: actions/checkout@v4 + - name: Add ARGs and ENVs to Dockerfile + run: | + # Create the ARG and ENV lines + cat << 'EOF' > /tmp/docker_vars.txt + + # Build arguments + ARG ${{ secrets.ENV_VAR_NAME_1 }} + ARG ${{ secrets.ENV_VAR_NAME_2 }} + + # Environment variables + ENV ${{ secrets.ENV_VAR_NAME_1 }}=$${{ secrets.ENV_VAR_NAME_1 }} + ENV ${{ secrets.ENV_VAR_NAME_2 }}=$${{ secrets.ENV_VAR_NAME_2 }} + EOF + + # Insert into Dockerfile + sed -i '/^WORKDIR \/app$/r /tmp/docker_vars.txt' Dockerfile + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -48,6 +65,9 @@ jobs: platforms: linux/amd64 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} + build-args: | + ${{ secrets.ENV_VAR_NAME_1 }}=${{ secrets.ENV_VAR_VALUE_1 }} + ${{ secrets.ENV_VAR_NAME_2 }}=${{ secrets.ENV_VAR_VALUE_2 }} cache-from: type=gha cache-to: type=gha,mode=max @@ -55,16 +75,16 @@ jobs: run: | # Extract the short SHA SHORT_SHA=$(echo ${{ github.sha }} | cut -c1-7) - + # Update the image in nexlayer.yaml sed -i "s|image:.*|image: ghcr.io/nexlayer/${{ env.IMAGE_NAME }}:$SHORT_SHA|" nexlayer.yaml - - # Display the updated file for verification - cat nexlayer.yaml + + # Add environment variables + sed -i '/^ path: "\/"/a\ vars:\n ${{ secrets.ENV_VAR_NAME_1 }}: ${{ secrets.ENV_VAR_VALUE_1 }}\n ${{ secrets.ENV_VAR_NAME_2 }}: ${{ secrets.ENV_VAR_VALUE_2 }}' nexlayer.yaml - name: Deploy to Nexlayer run: | # Deploy to Nexlayer using the API - curl -X POST https://app.nexlayer.io/startUserDeployment \ + curl -X POST https://app.nexlayer.io/startUserDeployment/${{ secrets.NEXLAYER_TEST_SESSION_TOKEN }} \ -H "Content-Type: text/x-yaml" \ --data-binary @nexlayer.yaml diff --git a/default.conf b/default.conf index a70dd67..749ec99 100644 --- a/default.conf +++ b/default.conf @@ -18,6 +18,36 @@ server { proxy_read_timeout 86400; } + location ~ ^/ingest/static/(.*)$ { + resolver 8.8.8.8 8.8.4.4 valid=300s; + resolver_timeout 5s; + proxy_pass https://us-assets.i.posthog.com/static/$1; + proxy_ssl_server_name on; + proxy_ssl_protocols TLSv1.2 TLSv1.3; + proxy_set_header Host us-assets.i.posthog.com; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_buffering off; + proxy_http_version 1.1; + proxy_redirect off; + } + + location ~ ^/ingest/(.*)$ { + resolver 8.8.8.8 8.8.4.4 valid=300s; + resolver_timeout 5s; + proxy_pass https://us.i.posthog.com/$1$is_args$args; + proxy_ssl_server_name on; + proxy_ssl_protocols TLSv1.2 TLSv1.3; + proxy_set_header Host us.i.posthog.com; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_buffering off; + proxy_http_version 1.1; + proxy_redirect off; + } + location = /about { try_files /about.html =404; } diff --git a/public/site.webmanifest b/public/site.webmanifest index b1f1068..298836b 100644 --- a/public/site.webmanifest +++ b/public/site.webmanifest @@ -1,23 +1,19 @@ -<<<<<<< HEAD { "name": "Nexlayer - The AI-Native Cloud", "short_name": "Nexlayer", "icons": [ { - "src": "/icon-192.png", + "src": "/android-chrome-192x192.png", "sizes": "192x192", "type": "image/png" }, { - "src": "/icon-512.png", + "src": "/android-chrome-512x512.png", "sizes": "512x512", "type": "image/png" } ], - "theme_color": "#23B6CB", - "background_color": "#0b0c10", + "theme_color": "#ffffff", + "background_color": "#ffffff", "display": "standalone" } -======= -{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"} ->>>>>>> gitlab/develop