Update | Docker config

Author: macarci

.env .env.docker

@@ -1,5 +1,5 @@
-USE_ENVIRONMENT_CONFIG=true
+REACT_APP_USE_ENVIRONMENT_CONFIG=false
+REACT_APP_TIMEOUT_SPAN=300000
+REACT_APP_APP_ID=admin
 REACT_APP_LOCALHOST=https://app.cenit.io
 REACT_APP_CENIT_HOST=https://server.cenit.io
-TIMEOUT_SPAN=300000
-REACT_APP_APP_ID=admin

.gitignore

@@ -13,10 +13,7 @@
 
 # misc
 .DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
+.env*
 
 # IDEs and editors
 /.idea

Dockerfile

@@ -8,7 +8,10 @@ COPY package-lock.json .
 RUN npm install -g npm@latest
 RUN npm ci --silent
 RUN npm install react-scripts --production -g --silent
-COPY . .
+COPY env.sh .
+COPY src src/
+COPY public public/
+COPY conf conf/
 RUN npm run build
 
 # => Run container
@@ -20,6 +23,6 @@ COPY --from=builder /app/build /usr/share/nginx/html/
 EXPOSE 80
 WORKDIR /usr/share/nginx/html
 COPY ./env.sh .
-COPY .env .
+COPY .env.docker .env
 RUN chmod +x env.sh
 CMD ["/bin/sh", "-c", "/usr/share/nginx/html/env.sh && nginx -g \"daemon off;\""]

README.md

@@ -39,6 +39,6 @@ And that's all!
 docker run -dti -e REACT_APP_LOCALHOST=http://127.0.0.1:3001 \
     -e REACT_APP_CENIT_HOST=http://127.0.0.1:3000 \
     -p 3000:80 \
-    --name container_name ghcr.io/cenit-io/ui:latest
+    --name cenit-ui ghcr.io/cenit-io/ui:latest
 ```
 Navigate to http://localhost:3000/ in your browser to view the app.

development.md

@@ -4,20 +4,6 @@
 This is a React application for the administration of a Cenit Platform instance, that is currently under development.
 Follow these instructions to configure a local instance of Cenit and connect it as a backend for the app.
 
-## Configuring the Admin App
-
-Update public/config.js
-
-```
-window.appConfig = {
-    USE_ENVIRONMENT_CONFIG: "true",
-    REACT_APP_LOCALHOST: "http://127.0.0.1:3000",
-    REACT_APP_CENIT_HOST: "http://127.0.0.1:3001",
-    TIMEOUT_SPAN: "300000",
-    REACT_APP_APP_ID: "admin",
-}
-```
-
 ## Configuring the Backend
 
 1. Make sure the Cenit **local repository is up to date with the remote**. The developed branch of Cenit
@@ -78,9 +64,9 @@ See the section about [deployment](https://facebook.github.io/create-react-app/d
 ### Run with Docker
 
 ```
-docker run -dti -e REACT_APP_LOCALHOST=http://127.0.0.1:3001 \
-    -e REACT_APP_CENIT_HOST=http://127.0.0.1:3000 \
+docker run -dti -e REACT_APP_LOCALHOST=http://127.0.0.1:3000 \
+    -e REACT_APP_CENIT_HOST=http://127.0.0.1:3001 \
     -p 3000:80 \
-    --t cenit-ui:latest
+    -t cenit-ui:latest
 ```
 Navigate to http://localhost:3000/ in your browser to view the app.

package.json

@@ -38,7 +38,7 @@
     "sortablejs": "^1.12.0"
   },
   "scripts": {
-    "start": "chmod +x ./env.sh && ./env.sh && cp config.js ./public/ && react-scripts start",
+    "start": "react-scripts start",
     "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject"

public/config.js

@@ -1,7 +1,7 @@
 window.appConfig = {
-    USE_ENVIRONMENT_CONFIG: "true",
+    REACT_APP_USE_ENVIRONMENT_CONFIG: "true",
+    REACT_APP_TIMEOUT_SPAN: "300000",
+    REACT_APP_APP_ID: "admin",
     REACT_APP_LOCALHOST: "https://app.cenit.io",
     REACT_APP_CENIT_HOST: "https://server.cenit.io",
-    TIMEOUT_SPAN: "300000",
-    REACT_APP_APP_ID: "admin",
-}
+};

src/services/AuthorizationService.js

@@ -19,7 +19,7 @@ const EnvironmentProcessConfig = {
     appIdentifier: process.env.REACT_APP_APP_ID
 };
 
-export const Config = AppConfig.USE_ENVIRONMENT_CONFIG == "true" ? EnvironmentAppConfig : EnvironmentProcessConfig;
+export const Config = AppConfig.REACT_APP_USE_ENVIRONMENT_CONFIG === 'true' ? EnvironmentProcessConfig : EnvironmentAppConfig;
 
 export const CenitHostKey = 'cenitHost';