Skip to content

Commit 4ada721

Browse files
AudunSorheimAudunSorheim
authored
Use common github workflow (#218)
1 parent 9cafde7 commit 4ada721

16 files changed

+59
-212
lines changed

Diff for: ‎.env

-7
This file was deleted.

Diff for: ‎.env.production

-1
This file was deleted.

Diff for: ‎.github/workflows/build-and-deploy.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: Build & Deploy
2+
on: push
3+
4+
jobs:
5+
next-app:
6+
uses: navikt/teamesyfo-github-actions-workflows/.github/workflows/next-app.yaml@main
7+
secrets: inherit
8+
with:
9+
app: oppfolgingsplan-frontend
10+
base-path: /syk/oppfolgingsplaner

Diff for: ‎.github/workflows/demo-delete.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: Demo delete
2+
on: delete
3+
4+
jobs:
5+
branch-delete:
6+
uses: navikt/teamesyfo-github-actions-workflows/.github/workflows/next-app-demo-delete.yaml@main
7+
secrets: inherit
8+
with:
9+
app: oppfolgingsplan-frontend
10+
base-path: /syk/oppfolgingsplaner

Diff for: ‎.github/workflows/deploy-dev.yaml

-67
This file was deleted.

Diff for: ‎.github/workflows/main.yaml

-106
This file was deleted.

Diff for: ‎Dockerfile

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
FROM node:16-alpine
1+
FROM gcr.io/distroless/nodejs:18 as runtime
22

3-
ENV NODE_ENV production
3+
WORKDIR /app
44

5-
COPY /next.config.js ./
6-
COPY /.next ./.next
7-
COPY /public ./public
8-
COPY /node_modules ./node_modules
9-
COPY /package.json ./package.json
5+
COPY package.json /app/
6+
COPY .next/standalone /app/
7+
COPY public /app/public/
108

11-
CMD ["npm", "start"]
9+
EXPOSE 3000
1210

13-
EXPOSE 8080
11+
ENV NODE_ENV=production
12+
13+
CMD ["server.js"]

Diff for: ‎nais/envs/.env.demo

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
NEXT_PUBLIC_BASE_PATH=/syk/oppfolgingsplaner
2+
NEXT_PUBLIC_ASSET_PREFIX=https://cdn.nav.no/team-esyfo/oppfolgingsplan-frontend
3+
NEXT_PUBLIC_RUNTIME_ENVIRONMENT=demo
4+
NEXT_PUBLIC_TELEMETRY_URL=https://telemetry.ekstern.dev.nav.no/collect
5+
NEXT_PUBLIC_DITT_SYKEFRAVAER_URL=https://demo.ekstern.dev.nav.no/syk/sykefravaer
6+
NEXT_PUBLIC_DINE_SYKMELDTE_URL=https://dinesykmeldte.ekstern.dev.nav.no/arbeidsgiver/sykmeldte

Diff for: ‎nais/envs/.env.dev

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
NEXT_PUBLIC_BASE_PATH=/syk/oppfolgingsplaner
2+
NEXT_PUBLIC_ASSET_PREFIX=https://cdn.nav.no/team-esyfo/oppfolgingsplan-frontend
3+
NEXT_PUBLIC_RUNTIME_ENVIRONMENT=dev
4+
NEXT_PUBLIC_TELEMETRY_URL=https://telemetry.ekstern.dev.nav.no/collect
5+
NEXT_PUBLIC_DITT_SYKEFRAVAER_URL=https://www.ekstern.dev.nav.no/syk/sykefravaer
6+
NEXT_PUBLIC_DINE_SYKMELDTE_URL=https://www.ekstern.dev.nav.no/arbeidsgiver/sykmeldte

Diff for: ‎nais/envs/.env.prod

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
NEXT_PUBLIC_BASE_PATH=/syk/oppfolgingsplaner
2+
NEXT_PUBLIC_ASSET_PREFIX=https://cdn.nav.no/team-esyfo/oppfolgingsplan-frontend
3+
NEXT_PUBLIC_RUNTIME_ENVIRONMENT=prod
4+
NEXT_PUBLIC_TELEMETRY_URL=https://telemetry.nav.no/collect
5+
NEXT_PUBLIC_DITT_SYKEFRAVAER_URL=https://www.nav.no/syk/sykefravaer
6+
NEXT_PUBLIC_DINE_SYKMELDTE_URL=https://www.nav.no/arbeidsgiver/sykmeldte

Diff for: ‎nais/naiserator-demo.yaml renamed to ‎nais/nais-demo.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
apiVersion: "nais.io/v1alpha1"
22
kind: "Application"
33
metadata:
4-
name: oppfolgingsplan-frontend-demo
4+
name: {{appname}}-demo
55
namespace: team-esyfo
66
labels:
77
team: team-esyfo
8+
branchState: {{branchState}}
89
spec:
910
image: {{ image }}
1011
replicas:
1112
min: 1
1213
max: 1
1314
cpuThresholdPercentage: 90
14-
port: 8080
15+
port: 3000
1516
tokenx:
1617
enabled: false
1718
idporten:
@@ -40,7 +41,7 @@ spec:
4041
cpu: 200m
4142
memory: 256Mi
4243
ingresses:
43-
- "https://demo.ekstern.dev.nav.no/syk/oppfolgingsplaner"
44+
- {{ingress}}
4445
accessPolicy:
4546
outbound:
4647
external:

Diff for: ‎nais/naiserator-dev.yaml renamed to ‎nais/nais-dev.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ spec:
1111
min: 2
1212
max: 4
1313
cpuThresholdPercentage: 90
14-
port: 8080
14+
port: 3000
1515
tokenx:
1616
enabled: true
1717
idporten:

Diff for: ‎nais/naiserator-prod.yaml renamed to ‎nais/nais-prod.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ spec:
1111
min: 2
1212
max: 4
1313
cpuThresholdPercentage: 90
14-
port: 8080
14+
port: 3000
1515
tokenx:
1616
enabled: true
1717
idporten:

Diff for: ‎next.config.js

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const moduleExports = {
88
// ssr and displayName are configured by default
99
styledComponents: true,
1010
},
11+
output: "standalone",
1112
};
1213

1314
module.exports = moduleExports;

Diff for: ‎package.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@
22
"name": "oppfolgingsplan-frontend",
33
"version": "0.1.0",
44
"private": true,
5+
"engines": {
6+
"node": "18"
7+
},
58
"scripts": {
69
"dev": "next dev",
710
"build": "next build",
8-
"start": "next start -p 8080",
11+
"start:watch": "NODE_OPTIONS='--inspect' next dev | pino-pretty",
12+
"start:prod": "NODE_OPTIONS='-r next-logger' next start",
913
"lint": "next lint",
1014
"prettier": "prettier --write ./src/**",
1115
"prepare": "husky install",

Diff for: ‎src/environments/publicEnv.ts

-16
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,10 @@ export const isDev = () => {
2020
};
2121

2222
export const dineSykemeldteRoot = (): string => {
23-
if (isDemo()) {
24-
return process.env.NEXT_PUBLIC_DINE_SYKMELDTE_DEMO_URL || "";
25-
}
26-
27-
if (isDev()) {
28-
return process.env.NEXT_PUBLIC_DINE_SYKMELDTE_DEV_URL || "";
29-
}
30-
3123
return process.env.NEXT_PUBLIC_DINE_SYKMELDTE_URL || "";
3224
};
3325

3426
export const dittSykefravarRoot = (): string => {
35-
if (isDemo()) {
36-
return process.env.NEXT_PUBLIC_DITT_SYKEFRAVAER_DEMO_URL || "";
37-
}
38-
39-
if (isDev()) {
40-
return process.env.NEXT_PUBLIC_DITT_SYKEFRAVAER_DEV_URL || "";
41-
}
42-
4327
return process.env.NEXT_PUBLIC_DITT_SYKEFRAVAER_URL || "";
4428
};
4529
export const displayTestScenarioSelector =

0 commit comments

Comments
 (0)