mirror of
https://github.com/Tria-plc/edr-platform.git
synced 2026-08-26 18:42:49 +00:00
fix
This commit is contained in:
@@ -1,5 +1,7 @@
|
|||||||
# Copy to .env for local/docker compose (not committed).
|
# Copy to .env for local/docker compose (not committed).
|
||||||
PORT=3001
|
PORT=3001
|
||||||
|
# GT06 GPS tracker TCP listener port (raw TCP, must be reachable by tracker SIMs). 0 disables.
|
||||||
|
GT06_TCP_PORT=5023
|
||||||
DB_HOST=localhost
|
DB_HOST=localhost
|
||||||
DB_PORT=5433
|
DB_PORT=5433
|
||||||
DB_USER=postgres
|
DB_USER=postgres
|
||||||
|
|||||||
@@ -40,4 +40,6 @@ RUN addgroup --system --gid 1001 nodejs \
|
|||||||
COPY --from=deployer --chown=nestjs:nodejs /deploy .
|
COPY --from=deployer --chown=nestjs:nodejs /deploy .
|
||||||
USER nestjs
|
USER nestjs
|
||||||
EXPOSE 3001
|
EXPOSE 3001
|
||||||
|
# GT06 GPS tracker TCP listener (raw TCP, not HTTP). Change via GT06_TCP_PORT.
|
||||||
|
EXPOSE 5023
|
||||||
CMD ["node", "dist/main.js"]
|
CMD ["node", "dist/main.js"]
|
||||||
|
|||||||
@@ -16,6 +16,8 @@ services:
|
|||||||
- npmrc
|
- npmrc
|
||||||
ports:
|
ports:
|
||||||
- "${FREIGHT_API_PORT:-3001}:${FREIGHT_API_PORT:-3001}"
|
- "${FREIGHT_API_PORT:-3001}:${FREIGHT_API_PORT:-3001}"
|
||||||
|
# GT06 GPS tracker TCP ingestion (raw TCP — must be reachable by tracker SIMs).
|
||||||
|
- "${GT06_TCP_PORT:-5023}:${GT06_TCP_PORT:-5023}"
|
||||||
env_file:
|
env_file:
|
||||||
- apps/edr-freight-api/.env
|
- apps/edr-freight-api/.env
|
||||||
extra_hosts:
|
extra_hosts:
|
||||||
@@ -52,6 +54,7 @@ services:
|
|||||||
VITE_API_URL: ${VITE_API_URL:-}
|
VITE_API_URL: ${VITE_API_URL:-}
|
||||||
VITE_BASE_API_URL: ${VITE_BASE_API_URL:-}
|
VITE_BASE_API_URL: ${VITE_BASE_API_URL:-}
|
||||||
VITE_USER_MANAGEMENT_BASE: ${VITE_USER_MANAGEMENT_BASE:-}
|
VITE_USER_MANAGEMENT_BASE: ${VITE_USER_MANAGEMENT_BASE:-}
|
||||||
|
VITE_GOOGLE_MAPS_API_KEY: ${VITE_GOOGLE_MAPS_API_KEY:-}
|
||||||
secrets:
|
secrets:
|
||||||
- npmrc
|
- npmrc
|
||||||
ports:
|
ports:
|
||||||
@@ -66,6 +69,7 @@ services:
|
|||||||
VITE_API_URL: ${VITE_API_URL:-}
|
VITE_API_URL: ${VITE_API_URL:-}
|
||||||
VITE_BASE_API_URL: ${VITE_BASE_API_URL:-}
|
VITE_BASE_API_URL: ${VITE_BASE_API_URL:-}
|
||||||
VITE_USER_MANAGEMENT_BASE: ${VITE_USER_MANAGEMENT_BASE:-}
|
VITE_USER_MANAGEMENT_BASE: ${VITE_USER_MANAGEMENT_BASE:-}
|
||||||
|
VITE_GOOGLE_MAPS_API_KEY: ${VITE_GOOGLE_MAPS_API_KEY:-}
|
||||||
secrets:
|
secrets:
|
||||||
- npmrc
|
- npmrc
|
||||||
ports:
|
ports:
|
||||||
|
|||||||
@@ -27,10 +27,12 @@ ARG VITE_API_URL
|
|||||||
ARG VITE_BASE_API_URL
|
ARG VITE_BASE_API_URL
|
||||||
ARG VITE_USER_MANAGEMENT_BASE
|
ARG VITE_USER_MANAGEMENT_BASE
|
||||||
ARG NEXT_PUBLIC_API_URL
|
ARG NEXT_PUBLIC_API_URL
|
||||||
|
ARG VITE_GOOGLE_MAPS_API_KEY
|
||||||
ENV VITE_API_URL=${VITE_API_URL}
|
ENV VITE_API_URL=${VITE_API_URL}
|
||||||
ENV VITE_BASE_API_URL=${VITE_BASE_API_URL}
|
ENV VITE_BASE_API_URL=${VITE_BASE_API_URL}
|
||||||
ENV VITE_USER_MANAGEMENT_BASE=${VITE_USER_MANAGEMENT_BASE}
|
ENV VITE_USER_MANAGEMENT_BASE=${VITE_USER_MANAGEMENT_BASE}
|
||||||
ENV NEXT_PUBLIC_API_URL=${NEXT_PUBLIC_API_URL}
|
ENV NEXT_PUBLIC_API_URL=${NEXT_PUBLIC_API_URL}
|
||||||
|
ENV VITE_GOOGLE_MAPS_API_KEY=${VITE_GOOGLE_MAPS_API_KEY}
|
||||||
|
|
||||||
RUN if [ -z "$VITE_API_URL" ] || [ -z "$VITE_BASE_API_URL" ] || [ -z "$VITE_USER_MANAGEMENT_BASE" ]; then \
|
RUN if [ -z "$VITE_API_URL" ] || [ -z "$VITE_BASE_API_URL" ] || [ -z "$VITE_USER_MANAGEMENT_BASE" ]; then \
|
||||||
echo "ERROR: VITE_API_URL, VITE_BASE_API_URL, and VITE_USER_MANAGEMENT_BASE must all be set" && \
|
echo "ERROR: VITE_API_URL, VITE_BASE_API_URL, and VITE_USER_MANAGEMENT_BASE must all be set" && \
|
||||||
|
|||||||
Reference in New Issue
Block a user