♻️ Cleaned docker-files up

This commit is contained in:
Mawoka
2022-03-11 16:56:34 +01:00
parent a913f1f0a6
commit 48bfb3912f
2 changed files with 5 additions and 10 deletions
+4 -8
View File
@@ -6,16 +6,12 @@ services:
build:
context: ./frontend
dockerfile: Dockerfile
args:
redis: "{$REDIS}"
depends_on:
- redis
- api
environment:
REDIS_URL: redis://redis:6379/0?decode_responses=True
API_URL: http://api:80
env_file:
- .env
api:
build:
context: .
@@ -37,8 +33,6 @@ services:
ACCESS_TOKEN_EXPIRE_MINUTES: 30
SKIP_EMAIL_VERIFICATION: True
HCAPTCHA_KEY: "HCAPTCHA_PRIVATE_KEY"
env_file:
- .env
redis:
image: redis:alpine
restart: always
@@ -57,11 +51,13 @@ services:
POSTGRES_PASSWORD: "classquiz"
POSTGRES_DB: "classquiz"
volumes:
- ./db:/var/lib/postgresql/data
- data:/var/lib/postgresql/data
proxy:
image: caddy:alpine
restart: always
volumes:
- ./Caddyfile-docker:/etc/caddy/Caddyfile
ports:
- "8000:8080"
- "8000:8080"
volumes:
data:
+1 -2
View File
@@ -1,10 +1,9 @@
### Build Step
# pull the Node.js Docker image
ARG redis
FROM node:16 as builder
# ENV API_URL=http://api:80
ENV API_URL=https://mawoka.eu
ENV REDIS_URL=$REDIS
ENV REDIS_URL=rediss://:3e49f55793714c518f6bf7aa2970f7e5@gusc1-romantic-civet-31589.upstash.io:31589
ENV VITE_HCAPTCHA=ee81b2a1-acf3-4d20-b2a4-a7ea94c7eba5
ENV VITE_SENTRY=https://4981de1f72f24fd7b5e21b8913b93a02@o661934.ingest.sentry.io/6254641
# change working directory