Felles dockerfile, allt over på distroless

.github/workflows/.deploy-app-to-dev.yml

@@ -32,15 +32,19 @@ jobs:
             - name: Build application
               run: yarn build-${{ inputs.app-name }}
 
+            - name: Build with turbo
+              run: yarn turbo run build-app --filter=@navikt/${{ inputs.app-name }}
+
             - name: Build and publish docker image
               uses: nais/docker-build-push@v0
               id: docker-push
               with:
                   team: dusseldorf
                   push_image: true
                   pull: true
-                  dockerfile: apps/${{inputs.app-name}}/Dockerfile
+                  dockerfile: Dockerfile
                   docker_context: .
+                  build_args: APP_NAME=${{ inputs.app-name }}
                   image_suffix: ${{inputs.app-name}}-mono
                   project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
                   identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}

.github/workflows/.deploy-app-to-prod.yml

@@ -11,8 +11,8 @@ on:
                 required: true
 
 jobs:
-    deploy-to-prod:
-        name: Deploy ${{ inputs.app-name }} to prod
+    build:
+        name: Build ${{ inputs.app-name }}
         runs-on: ubuntu-latest
         permissions:
             id-token: write # required: nais/docker-build-push
@@ -29,36 +29,44 @@ jobs:
                   cache: 'yarn'
 
             - name: Install dependencies (yarn)
-              run: yarn
+              run: yarn install --production
 
             - name: Build application
               run: yarn build-${{ inputs.app-name }}
 
+            - name: Build with turbo
+              run: yarn turbo run build-app --filter=@navikt/${{ inputs.app-name }}
+
             - name: Build and publish docker image
               uses: nais/docker-build-push@v0
               id: docker-push
               with:
                   team: dusseldorf
                   push_image: true
                   pull: true
-                  dockerfile: apps/${{inputs.app-name}}/Dockerfile
+                  dockerfile: Dockerfile
                   docker_context: .
+                  build_args: APP_NAME=${{ inputs.app-name }}
                   image_suffix: ${{inputs.app-name}}-mono
                   project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
                   identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
 
-            - name: Deploy to prod
-              uses: nais/deploy/actions/deploy@v1
+    deploy:
+        name: Deploy ${{ inputs.app-name }} to prod
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+            - uses: nais/deploy/actions/deploy@v1
               env:
                   CLUSTER: prod-gcp
                   RESOURCE: nais-config/nais.yml
                   VARS: apps/${{ inputs.app-name }}/nais/prod-gcp.json
                   VAR: GITHUB_REF_NAME=${{ github.ref_name }} # brukes i applikasjonerna
                   APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
-                  IMAGE: ${{ steps.docker-push.outputs.image }}
+                  IMAGE: ${{ needs.build.outputs.image }}
 
     trivy:
-        needs: [ deploy-to-prod ]
+        needs: [ build ]
         uses: navikt/sif-gha-workflows/.github/workflows/trivy.yml@main
         permissions:
             contents: write
@@ -67,5 +75,5 @@ jobs:
             actions: read
         secrets: inherit
         with:
-            image: ${{ needs.deploy-to-prod.outputs.image }}
+            image: ${{ needs.build.outputs.image }}
             team: dusseldorf

Dockerfile

@@ -0,0 +1,19 @@
+FROM gcr.io/distroless/nodejs18-debian11
+ARG APP_NAME
+
+LABEL org.opencontainers.image.title=${APP_NAME}
+
+WORKDIR /app
+
+# Required by server.cjs
+COPY /node_modules/ /node_modules/
+
+# Local files
+COPY /apps/${APP_NAME}/server.cjs .
+COPY /apps/${APP_NAME}/tokenx.cjs .
+COPY /apps/${APP_NAME}/package.json .
+COPY /apps/${APP_NAME}/src/build/decorator.cjs ./src/build/decorator.cjs
+COPY /apps/${APP_NAME}/dist ./dist
+
+EXPOSE 8080
+CMD ["server.cjs"]