Skip to content
Snippets Groups Projects
Commit 1912bafc authored by OZGCloud's avatar OZGCloud
Browse files

OZG-5271 OZG-5781 Use Node@20 for builder image

parent f591479e
No related branches found
No related tags found
No related merge requests found
FROM node:18 as builder FROM node:20 as builder
ARG NODE_ENV ARG NODE_ENV
ARG BUILD_FLAG ARG BUILD_FLAG
......
...@@ -8,15 +8,24 @@ ...@@ -8,15 +8,24 @@
"targets": { "targets": {
"build": { "build": {
"executor": "@angular-devkit/build-angular:browser", "executor": "@angular-devkit/build-angular:browser",
"outputs": ["{options.outputPath}"], "outputs": [
"{options.outputPath}"
],
"options": { "options": {
"outputPath": "dist/apps/admin", "outputPath": "dist/apps/admin",
"index": "apps/admin/src/index.html", "index": "apps/admin/src/index.html",
"main": "apps/admin/src/main.ts", "main": "apps/admin/src/main.ts",
"polyfills": ["zone.js"], "polyfills": [
"zone.js"
],
"tsConfig": "apps/admin/tsconfig.app.json", "tsConfig": "apps/admin/tsconfig.app.json",
"assets": ["apps/admin/src/favicon.ico", "apps/admin/src/assets"], "assets": [
"styles": ["apps/admin/src/styles.scss"], "apps/admin/src/favicon.ico",
"apps/admin/src/assets"
],
"styles": [
"apps/admin/src/styles.scss"
],
"scripts": [], "scripts": [],
"stylePreprocessorOptions": { "stylePreprocessorOptions": {
"includePaths": [ "includePaths": [
...@@ -77,11 +86,15 @@ ...@@ -77,11 +86,15 @@
}, },
"lint": { "lint": {
"executor": "@nx/eslint:lint", "executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"] "outputs": [
"{options.outputFile}"
]
}, },
"test": { "test": {
"executor": "@nx/jest:jest", "executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "outputs": [
"{workspaceRoot}/coverage/{projectRoot}"
],
"options": { "options": {
"jestConfig": "apps/admin/jest.config.ts" "jestConfig": "apps/admin/jest.config.ts"
} }
...@@ -94,14 +107,20 @@ ...@@ -94,14 +107,20 @@
}, },
"container": { "container": {
"executor": "@nx-tools/nx-container:build", "executor": "@nx-tools/nx-container:build",
"dependsOn": ["build"], "dependsOn": [
"build"
],
"options": { "options": {
"engine": "docker", "engine": "docker",
"push": false, "push": false,
"metadata": { "metadata": {
"images": ["docker.ozg-sh.de/admin-client"], "images": [
"docker.ozg-sh.de/admin-client"
],
"load": true, "load": true,
"tags": ["build-latest"] "tags": [
"build-latest"
]
} }
} }
} }
......
# Benutzt das vorher zu bauende Docker image "nx-build-base:x.y.z" # Benutzt das vorher zu bauende Docker image "nx-build-base:x.y.z"
# Siehe ../Dockerfile.nx-build-base # Siehe ../Dockerfile.nx-build-base
FROM docker.ozg-sh.de/nx-build-base:1.0.0 AS builder FROM docker.ozg-sh.de/nx-build-base:2.0.0 AS builder
ARG NODE_ENV ARG NODE_ENV
ARG CONFIGURATION ARG CONFIGURATION
......
...@@ -14,7 +14,9 @@ ...@@ -14,7 +14,9 @@
"build": { "build": {
"executor": "@angular-devkit/build-angular:browser", "executor": "@angular-devkit/build-angular:browser",
"options": { "options": {
"allowedCommonJsDependencies": ["file-saver"], "allowedCommonJsDependencies": [
"file-saver"
],
"outputPath": "dist/apps/alfa", "outputPath": "dist/apps/alfa",
"index": "apps/alfa/src/index.html", "index": "apps/alfa/src/index.html",
"main": "apps/alfa/src/main.ts", "main": "apps/alfa/src/main.ts",
...@@ -34,7 +36,9 @@ ...@@ -34,7 +36,9 @@
"output": "assets/icons" "output": "assets/icons"
} }
], ],
"styles": ["apps/alfa/src/styles/main.scss"], "styles": [
"apps/alfa/src/styles/main.scss"
],
"scripts": [], "scripts": [],
"stylePreprocessorOptions": { "stylePreprocessorOptions": {
"includePaths": [ "includePaths": [
...@@ -81,7 +85,9 @@ ...@@ -81,7 +85,9 @@
] ]
} }
}, },
"outputs": ["{options.outputPath}"] "outputs": [
"{options.outputPath}"
]
}, },
"serve": { "serve": {
"executor": "@angular-devkit/build-angular:dev-server", "executor": "@angular-devkit/build-angular:dev-server",
...@@ -103,7 +109,9 @@ ...@@ -103,7 +109,9 @@
}, },
"lint": { "lint": {
"executor": "@nx/eslint:lint", "executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"] "outputs": [
"{options.outputFile}"
]
}, },
"test": { "test": {
"executor": "@nx/jest:jest", "executor": "@nx/jest:jest",
...@@ -111,7 +119,9 @@ ...@@ -111,7 +119,9 @@
"tsConfig": "apps/alfa/tsconfig.spec.json", "tsConfig": "apps/alfa/tsconfig.spec.json",
"jestConfig": "apps/alfa/jest.config.ts" "jestConfig": "apps/alfa/jest.config.ts"
}, },
"outputs": ["{workspaceRoot}/coverage/apps/alfa"] "outputs": [
"{workspaceRoot}/coverage/apps/alfa"
]
} }
} }
} }
\ No newline at end of file
...@@ -8,15 +8,24 @@ ...@@ -8,15 +8,24 @@
"targets": { "targets": {
"build": { "build": {
"executor": "@angular-devkit/build-angular:browser", "executor": "@angular-devkit/build-angular:browser",
"outputs": ["{options.outputPath}"], "outputs": [
"{options.outputPath}"
],
"options": { "options": {
"outputPath": "dist/apps/demo", "outputPath": "dist/apps/demo",
"index": "apps/demo/src/index.html", "index": "apps/demo/src/index.html",
"main": "apps/demo/src/main.ts", "main": "apps/demo/src/main.ts",
"polyfills": ["zone.js"], "polyfills": [
"zone.js"
],
"tsConfig": "apps/demo/tsconfig.app.json", "tsConfig": "apps/demo/tsconfig.app.json",
"assets": ["apps/demo/src/favicon.ico", "apps/demo/src/assets"], "assets": [
"styles": ["apps/demo/src/styles.scss"], "apps/demo/src/favicon.ico",
"apps/demo/src/assets"
],
"styles": [
"apps/demo/src/styles.scss"
],
"scripts": [] "scripts": []
}, },
"configurations": { "configurations": {
...@@ -66,11 +75,15 @@ ...@@ -66,11 +75,15 @@
}, },
"lint": { "lint": {
"executor": "@nx/eslint:lint", "executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"] "outputs": [
"{options.outputFile}"
]
}, },
"test": { "test": {
"executor": "@nx/jest:jest", "executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "outputs": [
"{workspaceRoot}/coverage/{projectRoot}"
],
"options": { "options": {
"jestConfig": "apps/demo/jest.config.ts" "jestConfig": "apps/demo/jest.config.ts"
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# Benötigt vorheriges `docker login docker.ozg-sh.de -u developer -p ******` # Benötigt vorheriges `docker login docker.ozg-sh.de -u developer -p ******`
# TODO Image-Version aus der package.json extrahieren # TODO Image-Version aus der package.json extrahieren
VERSION="1.0.0" VERSION="2.0.0"
TAG="docker.ozg-sh.de/nx-build-base:${VERSION}" TAG="docker.ozg-sh.de/nx-build-base:${VERSION}"
echo "Building ${TAG}..." echo "Building ${TAG}..."
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment