diff --git a/docker-compose.yml b/docker-compose.yml index cc2d843..1f36f9f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,19 +27,19 @@ services: frontend-default: build: context: ./frontend - args: - - VITE_TENANT=default - - VITE_TENANT_CLIENT_ID=e9fdb985-9173-4e01-9d73-ac2d60d1dc8e ports: - "5173:3000" + environment: + - VITE_TENANT=default + - VITE_TENANT_CLIENT_ID=e9fdb985-9173-4e01-9d73-ac2d60d1dc8e frontend-adac: build: context: ./frontend - args: - - VITE_TENANT=adac - - VITE_TENANT_CLIENT_ID=74b35a42-b914-4b7e-abb5-c5184a3ca334 ports: - "5174:3000" + environment: + - VITE_TENANT=adac + - VITE_TENANT_CLIENT_ID=74b35a42-b914-4b7e-abb5-c5184a3ca334 pin-service: build: ./services/pin-service ports: diff --git a/frontend/Dockerfile b/frontend/Dockerfile index e413cd4..573485f 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,10 +1,10 @@ FROM node:18-alpine -ARG VITE_TENANT -ARG VITE_TENANT_CLIENT_ID +# ARG VITE_TENANT +# ARG VITE_TENANT_CLIENT_ID -ENV VITE_TENANT=$VITE_TENANT -ENV VITE_TENANT_CLIENT_ID=$VITE_TENANT_CLIENT_ID +# ENV VITE_TENANT=$VITE_TENANT +# ENV VITE_TENANT_CLIENT_ID=$VITE_TENANT_CLIENT_ID WORKDIR /app @@ -12,9 +12,11 @@ COPY package*.json ./ RUN npm ci COPY . . -RUN npm run build - RUN npm install serve +# RUN npm run build + EXPOSE 3000 -ENTRYPOINT [ "npx", "serve", "-s" ,"dist" ] \ No newline at end of file +# ENTRYPOINT [ "npx", "serve", "-s" ,"dist" ] + +ENTRYPOINT [ "./entrypoint.sh" ] diff --git a/frontend/entrypoint.sh b/frontend/entrypoint.sh new file mode 100644 index 0000000..a63e6b7 --- /dev/null +++ b/frontend/entrypoint.sh @@ -0,0 +1,3 @@ +#!/bin/sh +npm run build +npx serve -s dist diff --git a/frontend/version.txt b/frontend/version.txt index e830bbd..1b48b6a 100644 --- a/frontend/version.txt +++ b/frontend/version.txt @@ -1 +1 @@ -v0.0.1a2 \ No newline at end of file +v0.0.1a3 \ No newline at end of file diff --git a/fusionauth/docker-compose.yml b/fusionauth/docker-compose.yml index 9254d48..a604fc8 100644 --- a/fusionauth/docker-compose.yml +++ b/fusionauth/docker-compose.yml @@ -66,9 +66,9 @@ services: restart: unless-stopped ports: - 9011:9011 - volumes: - - fusionauth_config:/usr/local/fusionauth/config - - ./kickstart:/usr/local/fusionauth/kickstart + # volumes: + # - fusionauth_config:/usr/local/fusionauth/config + # - ./kickstart:/usr/local/fusionauth/kickstart networks: db_net: