fix docker setup

.github/workflows/test_e2e.yml

@@ -22,7 +22,7 @@ jobs:
           cd database
           yarn && yarn dev_reset
           cd ../config
-          yarn && yarn build
+          yarn install
           cd ../backend
           yarn && yarn seed
 

backend/.env.test_e2e

@@ -1,11 +0,0 @@
-# Server
-JWT_EXPIRES_IN=2m
-
-GDT_ACTIVE=false
-
-# Email
-EMAIL=true
-EMAIL_TEST_MODUS=false
-EMAIL_TLS=false
-# for testing password reset
-EMAIL_CODE_REQUEST_TIME=1

backend/Dockerfile

@@ -56,7 +56,7 @@ FROM base as development
 # Run command
 # (for development we need to execute yarn install since the
 #  node_modules are on another volume and need updating)
-CMD /bin/sh -c "cd /config && yarn install && yarn build && cd /database && yarn install && yarn build && cd /app && yarn install && yarn run dev"
+CMD /bin/sh -c "cd /database && yarn install && yarn build && cd /config && yarn build && ls ./build/ && cd /app && ls -la ../config/build && yarn install && yarn run dev"
 
 ##################################################################################
 # BUILD (Does contain all files and is therefore bloated) ########################

backend/src/config/index.ts

@@ -2,10 +2,10 @@
 /* eslint-disable n/no-process-env */
 
 // eslint-disable-next-line import/no-unresolved
+import { validate } from '@config/index'
 import { latestDbVersion } from '@dbTools/config/detectLastDBVersion'
 import { Decimal } from 'decimal.js-light'
 import dotenv from 'dotenv'
-import { validate } from 'gradido-config'
 
 import { schema } from './schema'
 

backend/src/config/schema.ts

@@ -23,7 +23,7 @@ import {
   NODE_ENV,
   PRODUCTION,
   TYPEORM_LOGGING_RELATIVE_PATH,
-} from 'gradido-config'
+} from '@config/commonSchema'
 import Joi from 'joi'
 
 export const schema = Joi.object({

backend/tsconfig.json

@@ -60,7 +60,8 @@
       /* external */
       "@dbTools/*": ["../database/src/*", "../../database/build/src/*"],
       "@entity/*": ["../database/entity/*", "../../database/build/entity/*"],
-      "@logging/*": ["../database/logging/*", "../../database/build/logging/*"]
+      "@logging/*": ["../database/logging/*", "../../database/build/logging/*"],
+      "@config/*": ["../config/src/*", "../../config/build/*"]
     },
     // "rootDirs": [],                              /* List of root folders whose combined content represents the structure of the project at runtime. */
     "typeRoots": ["@types", "node_modules/@types"],   /* List of folders to include type definitions from. */

dht-node/Dockerfile

@@ -60,7 +60,7 @@ FROM base as development
 # Run command
 # (for development we need to execute yarn install since the
 #  node_modules are on another volume and need updating)
-CMD /bin/sh -c "cd /config && yarn install && yarn build && cd /database && yarn install && yarn build && cd /app && yarn install && yarn run dev"
+CMD /bin/sh -c "cd /database && yarn install && yarn build && cd /config && yarn build && cd /app && yarn install && yarn run dev"
 
 ##################################################################################
 # BUILD (Does contain all files and is therefore bloated) ########################

dht-node/src/config/index.ts

@@ -1,7 +1,7 @@
 /* eslint-disable n/no-process-env */
+import { validate } from '@config/index'
 import { latestDbVersion } from '@dbTools/config/detectLastDBVersion'
 import dotenv from 'dotenv'
-import { validate } from 'gradido-config'
 
 import { schema } from './schema'
 

dht-node/src/config/schema.ts

@@ -12,7 +12,7 @@ import {
   NODE_ENV,
   PRODUCTION,
   TYPEORM_LOGGING_RELATIVE_PATH,
-} from 'gradido-config'
+} from '@config/commonSchema'
 import Joi from 'joi'
 
 export const schema = Joi.object({

dht-node/tsconfig.json

@@ -53,7 +53,8 @@
       "@typeorm/*": ["../backend/src/typeorm/*", "../../backend/src/typeorm/*"],
       "@dbTools/*": ["../database/src/*", "../../database/build/src/*"],
       "@entity/*": ["../database/entity/*", "../../database/build/entity/*"],
-      "@logging/*": ["../database/logging/*", "../../database/build/logging/*"]
+      "@logging/*": ["../database/logging/*", "../../database/build/logging/*"],
+      "@config/*": ["../config/src/*", "../../config/build/*"]      
     },
     // "rootDirs": [],                              /* List of root folders whose combined content represents the structure of the project at runtime. */
     "typeRoots": ["src/dht_node/@types", "node_modules/@types"],   /* List of folders to include type definitions from. */

federation/Dockerfile

@@ -57,7 +57,7 @@ FROM base as development
 # Run command
 # (for development we need to execute yarn install since the
 #  node_modules are on another volume and need updating)
-CMD /bin/sh -c "cd /config && yarn install && yarn build && cd /database && yarn install && yarn build && cd /app && yarn install && yarn run dev"
+CMD /bin/sh -c "cd /database && yarn install && yarn build && cd /config && yarn build && cd /app && yarn install && yarn run dev"
 
 ##################################################################################
 # BUILD (Does contain all files and is therefore bloated) ########################

federation/src/config/index.ts

@@ -3,7 +3,7 @@ import { Decimal } from 'decimal.js-light'
 import { latestDbVersion } from '@dbTools/config/detectLastDBVersion'
 import dotenv from 'dotenv'
 
-import { validate } from 'gradido-config'
+import { validate } from '@config/index'
 
 import { schema } from './schema'
 

federation/src/config/schema.ts

@@ -12,7 +12,7 @@ import {
   NODE_ENV,
   PRODUCTION,
   TYPEORM_LOGGING_RELATIVE_PATH,
-} from 'gradido-config'
+} from '@config/commonSchema'
 import Joi from 'joi'
 
 export const schema = Joi.object({

federation/tsconfig.json

@@ -61,7 +61,8 @@
       "@typeorm/*": ["../backend/src/typeorm/*", "../../backend/src/typeorm/*"],
       "@dbTools/*": ["../database/src/*", "../../database/build/src/*"],
       "@entity/*": ["../database/entity/*", "../../database/build/entity/*"],
-      "@logging/*": ["../database/logging/*", "../../database/build/logging/*"]
+      "@logging/*": ["../database/logging/*", "../../database/build/logging/*"],
+      "@config/*": ["../config/src/*", "../../config/build/*"]
     },
     // "rootDirs": [],                              /* List of root folders whose combined content represents the structure of the project at runtime. */
     "typeRoots": ["node_modules/@types"],           /* List of folders to include type definitions from. */

frontend/vite.config.js

@@ -95,7 +95,6 @@ export default defineConfig(({ command }) => {
         autoInstall: true,
       }),
       EnvironmentPlugin({
-        BUILD_COMMIT: null,
         GMS_ACTIVE: null,
         HUMHUB_ACTIVE: null,
         DEFAULT_PUBLISHER_ID: null,
@@ -127,7 +126,7 @@ export default defineConfig(({ command }) => {
       extract: CONFIG.PRODUCTION === true,
       preprocessorOptions: {
         scss: {
-          additionalData: `@import "@/assets/scss/gradido.scss";`,
+          additionalData: `@use "@/assets/scss/custom/gradido-custom/color" as *;`,
         },
       },
     },