Fjernet appdynamics, lagt til import av srvuser fra google secrets

navikt · Nov 6, 2023 · a2e104b · a2e104b
1 parent 802e366
commit a2e104b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 51 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,7 @@
-FROM ghcr.io/navikt/baseimages/temurin:17-appdynamics
-
-ENV APPD_ENABLED=true
+FROM gcr.io/distroless/java17-debian11:nonroot
 LABEL org.opencontainers.image.source=https://github.com/navikt/k9-punsj
 
-COPY docker-init-scripts/import-serviceuser-credentials.sh /init-scripts/21-import-serviceuser-credentials.sh
-COPY docker-init-scripts/import-appdynamics-settings.sh /init-scripts/22-import-appdynamics-settings.sh
-
-
+WORKDIR /app
 COPY target/*.jar app.jar
+
+CMD [ "app.jar" ]
diff --git a/docker-init-scripts/import-appdynamics-settings.sh b/docker-init-scripts/import-appdynamics-settings.sh
diff --git a/docker-init-scripts/import-serviceuser-credentials.sh b/docker-init-scripts/import-serviceuser-credentials.sh
diff --git a/nais/dev-gcp.json b/nais/dev-gcp.json
@@ -16,7 +16,6 @@
   ],
   "database": {
     "tier": "db-n1-standard-1",
-    "diskAutoresize": "true",
     "highAvailability": "false"
   },
   "azureGrupper": [

diff --git a/nais/naiserator.yml b/nais/naiserator.yml
@@ -20,7 +20,7 @@ spec:
   gcp:
     sqlInstances:
       - type: POSTGRES_14
-        tier: db-f1-micro
+        tier: ${{ database.tier }}
         diskAutoresize: true
         highAvailability: {{ database.highAvailability }}
         databases:
@@ -61,6 +61,8 @@ spec:
     path: /internal/actuator/prometheus
   kafka:
     pool: nav-dev
+  envFrom:
+    - secret: k9-punsj-serviceuser
   env:
   {{#each env}}
      - name: {{@key}}