Skip to content

Commit

Permalink
Upgrade to Unleash v5
Browse files Browse the repository at this point in the history
  • Loading branch information
Starefossen committed Sep 15, 2023
1 parent e0123bf commit 196bc1f
Show file tree
Hide file tree
Showing 5 changed files with 749 additions and 570 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/v4.yml → .github/workflows/unleash.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Unleash v4
name: Unleash

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -7,10 +7,10 @@ concurrency:
on:
push:
branches:
- unleash-v4
- unleash-v5
pull_request:
branches:
- unleash-v4
- unleash-v5

env:
DATABASE_USERNAME: unleash
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
- uses: nais/platform-build-push-sign@main
id: push
with:
name: unleash-v4
name: ${{ github.ref }}
extra_tags: |
v${{ steps.version.outputs.unleash }}
v${{ steps.version.outputs.unleash }}-${{ steps.version.outputs.date }}-${{ steps.version.outputs.sha_short }}
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nodejs 18.17.0
nodejs 20.6.1
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build Stage
FROM node:18-alpine AS builder
FROM node:20-alpine AS builder

RUN mkdir -p /unleash && \
chown -R node:node /unleash && \
Expand All @@ -22,7 +22,7 @@ RUN yarn cache clean
RUN yarn install --production --frozen-lockfile

# Production Stage
FROM gcr.io/distroless/nodejs:18
FROM gcr.io/distroless/nodejs:20

LABEL org.opencontainers.image.source=https://github.com/nais/unleash
LABEL org.opencontainers.image.description="Unleash for NAIS"
Expand Down
34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,40 +20,40 @@
},
"dependencies": {
"google-auth-library": "^9.0.0",
"jsonwebtoken": "^9.0.1",
"jsonwebtoken": "^9.0.2",
"log4js": "^6.9.1",
"unleash-server": "4.23.4"
"unleash-server": "5.4.4"
},
"devDependencies": {
"@types/cors": "2.8.13",
"@types/cors": "2.8.14",
"@types/express": "4.17.17",
"@types/express-session": "1.17.7",
"@types/faker": "6.6.9",
"@types/jest": "^29.5.3",
"@types/jest": "^29.5.4",
"@types/js-yaml": "4.0.5",
"@types/jsonwebtoken": "^9.0.2",
"@types/make-fetch-happen": "10.0.1",
"@types/node": "18.17.0",
"@types/semver": "7.5.0",
"@types/node": "20.6.1",
"@types/semver": "7.5.2",
"@types/stoppable": "1.1.1",
"@types/supertest": "2.0.12",
"@types/type-is": "1.6.3",
"@types/uuid": "9.0.2",
"@typescript-eslint/eslint-plugin": "6.2.1",
"@typescript-eslint/parser": "6.2.1",
"eslint": "^8.46.0",
"@types/type-is": "1.6.4",
"@types/uuid": "9.0.4",
"@typescript-eslint/eslint-plugin": "6.7.0",
"@typescript-eslint/parser": "6.7.0",
"eslint": "^8.49.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-airbnb-typescript": "^17.1.0",
"eslint-config-prettier": "^8.10.0",
"eslint-plugin-import": "^2.28.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-no-only-tests": "^3.1.0",
"eslint-plugin-prettier": "^5.0.0",
"jest": "^29.6.2",
"nock": "^13.3.2",
"prettier": "^3.0.1",
"jest": "^29.7.0",
"nock": "^13.3.3",
"prettier": "^3.0.3",
"supertest": "^6.3.3",
"ts-jest": "^29.1.1",
"ts-node": "^10.9.1",
"typescript": "5.1.6"
"typescript": "5.2.2"
}
}
Loading

0 comments on commit 196bc1f

Please sign in to comment.