simplify env stuff

ls1intum · Aug 13, 2024 · 748733a · 748733a
1 parent 168a10f
commit 748733a
Show file tree

Hide file tree

Showing 9 changed files with 128 additions and 793 deletions.
diff --git a/webapp/.env.development b/webapp/.env.development
diff --git a/webapp/Dockerfile b/webapp/Dockerfile
@@ -4,6 +4,17 @@ WORKDIR /app
 
 COPY ./ /app/
 
+# Define the build argument
+ARG APPLICATION_SERVER_URL
+
+# Debugging step: Print all environment variables to see if APPLICATION_SERVER_URL is set
+RUN printenv
+
+# Replace the serverUrl in the environment.ts file with the value of APPLICATION_SERVER_URL
+RUN echo "Replacing serverUrl in environment.ts with: ${APPLICATION_SERVER_URL}" && \
+    sed -i "s|serverUrl: '[^']*'|serverUrl: '${APPLICATION_SERVER_URL}'|g" src/environments/environment.ts && \
+    cat src/environments/environment.ts
+
 RUN npm install
 RUN npm run build
 

diff --git a/webapp/angular.json b/webapp/angular.json
@@ -39,7 +39,7 @@
       "prefix": "app",
       "architect": {
         "build": {
-          "builder": "@ngx-env/builder:application",
+          "builder": "@angular-devkit/build-angular:application",
           "options": {
             "outputPath": "dist/webapp",
             "index": "src/index.html",
@@ -56,11 +56,7 @@
             "styles": [
               "src/styles.css"
             ],
-            "scripts": [],
-            "ngxEnv": {
-              "prefix": "NG_",
-              "root": "../../"
-            }
+            "scripts": []
           },
           "configurations": {
             "production": {
@@ -87,7 +83,7 @@
           "defaultConfiguration": "production"
         },
         "serve": {
-          "builder": "@ngx-env/builder:dev-server",
+          "builder": "@angular-devkit/build-angular:dev-server",
           "configurations": {
             "production": {
               "buildTarget": "webapp:build:production"
@@ -99,10 +95,10 @@
           "defaultConfiguration": "development"
         },
         "extract-i18n": {
-          "builder": "@ngx-env/builder:extract-i18n"
+          "builder": "@angular-devkit/build-angular:extract-i18n"
         },
         "test": {
-          "builder": "@ngx-env/builder:karma",
+          "builder": "@angular-devkit/build-angular:karma",
           "options": {
             "polyfills": [
               "zone.js",
@@ -127,9 +123,7 @@
           "options": {
             "configDir": ".storybook",
             "browserTarget": "webapp:build",
-            "styles": [
-              "src/styles.css"
-            ],
+            "styles": ["src/styles.css"],
             "compodoc": false,
             "port": 6006
           }