fix: add java http proxy options

Co-authored-by: sindrerh2 <[email protected]>
navikt · Nov 23, 2023 · d173eca · d173eca
1 parent 3f7f8ff
commit d173eca
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -98,18 +98,18 @@ jobs:
  VAR: image=${{ needs.build.outputs.image }}
  TIMEOUT: 15m
 
-  deploy-prod:
-  name: Deploy to NAIS prod
-  needs: [ build, deploy-dev, deploy-dev-t4 ]
-  if: "github.ref == 'refs/heads/master'"
-  runs-on: ubuntu-20.04
-  steps:
-  - uses: actions/checkout@v4
-  - uses: nais/deploy/actions/deploy@v1
-  env:
-  APIKEY: ${{ secrets.NAIS_AURA_DEPLOY_APIKEY }}
-  CLUSTER: prod-fss
-  RESOURCE: .nais/nais.yml
-  VARS: .nais/prod-vars.yml
-  VAR: image=${{ needs.build.outputs.image }}
-  TIMEOUT: 15m
+# deploy-prod:
+# name: Deploy to NAIS prod
+# needs: [ build, deploy-dev, deploy-dev-t4 ]
+# if: "github.ref == 'refs/heads/master'"
+# runs-on: ubuntu-20.04
+# steps:
+# - uses: actions/checkout@v4
+# - uses: nais/deploy/actions/deploy@v1
+# env:
+# APIKEY: ${{ secrets.NAIS_AURA_DEPLOY_APIKEY }}
+# CLUSTER: prod-fss
+# RESOURCE: .nais/nais.yml
+# VARS: .nais/prod-vars.yml
+# VAR: image=${{ needs.build.outputs.image }}
+# TIMEOUT: 15m
diff --git a/Dockerfile b/Dockerfile
@@ -3,5 +3,7 @@ WORKDIR /app
 COPY ./build/libs/gandalf-*.jar ./app.jar
 USER nonroot
 
+ENV JAVA_TOOL_OPTIONS="${JAVA_OPTS} ${JAVA_PROXY_OPTIONS}"
+
 CMD ["app.jar"]