dev mode local route, web timestamp env

hollaex · Nov 2, 2022 · 1f92673 · 1f92673
1 parent 93bdc6e
commit 1f92673
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/server/docker-compose.yaml b/server/docker-compose.yaml
@@ -33,11 +33,9 @@ services:
     env_file:
       - ./tools/hollaex-kit.env.local
     entrypoint:
-      - pm2-runtime
-      - start
-      - ecosystem.config.js
-      - --env
-      - development
+      - /bin/sh
+      - -c 
+      - ip -4 route list match 0/0 | awk '{print $$3 " host.docker.internal"}' >> /etc/hosts && cat /etc/hosts && pm2-runtime start ecosystem.config.js --env development;
     volumes:
       - ./api:/app/api
       - ./config:/app/config

diff --git a/server/tools/Dockerfile.pm2 b/server/tools/Dockerfile.pm2
@@ -22,7 +22,7 @@ FROM node:10.15.3-stretch-slim
 
 COPY --from=build /app /app
 
-RUN apt-get update && apt-get install -y --no-install-recommends git python build-essential && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y --no-install-recommends git iproute2 python build-essential && rm -rf /var/lib/apt/lists/*
 
 RUN npm install [email protected] [email protected] [email protected] -g
 

diff --git a/web/.env b/web/.env
@@ -20,3 +20,4 @@ REACT_APP_PLUGIN_DEV_MODE=
 REACT_APP_PLUGIN=
 REACT_APP_LANG=
 
+REACT_APP_LAST_BUILD=
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,3 +20,4 @@ REACT_APP_PLUGIN_DEV_MODE=
		REACT_APP_PLUGIN=
		REACT_APP_LANG=

		REACT_APP_LAST_BUILD=