diff --git a/.dockerignore b/.dockerignore index 5d08e57..6674348 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,8 +1,12 @@ -LICENSE -README.md -node_modules +.env +.env.* .env.example .git .gitignore -docker/** -scripts/** +dist +docker/Dockerfile +docker/compose.yml +LICENSE +node_modules +npm-debug.log +README.md diff --git a/.env.example b/.env.example index 68f1d64..3a1f561 100644 --- a/.env.example +++ b/.env.example @@ -1,5 +1,5 @@ -# All environment variables must be prefixed with VITE_ to be seen by client. +# All environment variables must be prefixed with VITE_ to be seen by client. # Self-hosted Services URLs. Do not include the trailing slash. VITE_BANG_URL="https://bang." VITE_GITEA_URL="https://git." diff --git a/docker/.env.example b/docker/.env.example deleted file mode 100644 index 3bc310e..0000000 --- a/docker/.env.example +++ /dev/null @@ -1,3 +0,0 @@ -PORT=5000 -DOMAIN=bang.mydomain.com -NETWORK=bridge diff --git a/docker/Dockerfile b/docker/Dockerfile index e2cfe9a..50df95e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -24,10 +24,10 @@ WORKDIR /app RUN npm install -g serve # Copy built assets from the builder stage -COPY --from=builder /app/dist ./ +COPY --from=builder /app/dist ./dist # Expose port 5000 for the server EXPOSE 5000 # Start the server using the `serve` package -CMD ["serve", "-s", ".", "-l", "5000"] +CMD ["serve", "-s", "dist", "-l", "5000"] diff --git a/docker/compose.yml b/docker/compose.yml index bad7225..cedf70d 100644 --- a/docker/compose.yml +++ b/docker/compose.yml @@ -1,7 +1,6 @@ networks: nginx-bridge: external: true - services: bang: build: @@ -9,13 +8,11 @@ services: dockerfile: docker/Dockerfile image: gib/bang:latest container_name: bang - env_file: [.env] + env_file: [../.env] hostname: bang - domainname: ${DOMAIN} - networks: ['${NETWORK}'] - #ports: ['5000:5000'] + domainname: ${VITE_BANG_URL} + networks: [nginx-bridge] stdin_open: true tty: true restart: unless-stopped - #volumes: ['.:/app'] - command: serve -s /app/dist -l 5000 + command: ['serve', '-s', 'dist', '-l', '5000']