diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml new file mode 100644 index 0000000..7d13ad1 --- /dev/null +++ b/docker-compose.dev.yaml @@ -0,0 +1,50 @@ +services: + backend: + image: golang:1.24 + working_dir: /backend + ports: + - "8082:8080" + depends_on: + - db + environment: + - DATABASE_URL=${DATABASE_URL} + - ODH_LICENCE_KEY=${ODH_LICENCE_KEY} + - TZ=Europe/Berlin + volumes: + - ./backend:/backend + command: go run cmd/server/main.go + restart: unless-stopped + db: + image: postgres:14 + environment: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres + POSTGRES_DB: postgres +# ports: +# - "5432:5432" + volumes: + - ./pgdata:/var/lib/postgresql/data + restart: unless-stopped + + frontend: + build: ./frontend + working_dir: /app + ports: + - "8083:8000" + depends_on: + - db + environment: + - DATABASE_URL=${DATABASE_URL} + volumes: + - ./frontend:/app + - ./backend/public/storage:/app/public/storage + command: sh -c "composer install --no-interaction && php -S 0.0.0.0:8000 -t public" + restart: unless-stopped + + admin: + image: adminer + restart: always + depends_on: + - db + ports: + - 5433:8080 \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index 7d13ad1..02c53df 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -2,8 +2,7 @@ services: backend: image: golang:1.24 working_dir: /backend - ports: - - "8082:8080" + depends_on: - db environment: @@ -29,8 +28,6 @@ services: frontend: build: ./frontend working_dir: /app - ports: - - "8083:8000" depends_on: - db environment: @@ -40,11 +37,20 @@ services: - ./backend/public/storage:/app/public/storage command: sh -c "composer install --no-interaction && php -S 0.0.0.0:8000 -t public" restart: unless-stopped + labels: + - "traefik.enable=true" + - "traefik.docker.network=traefik-docker_default" + - "traefik.http.routers.vindn.rule=Host(`${VIRTUAL_HOST}`) || Host(`www.${VIRTUAL_HOST}`)" + - "traefik.http.routers.vindn.entrypoints=websecure" + - "traefik.http.routers.vindn.tls.certresolver=letsencrypt" + - "traefik.http.services.vindn.loadbalancer.server.port=80" + - "traefik.http.routers.vindn.tls=true" + - "traefik.http.routers.vindn.middlewares=www-redirect-reverse_vindn" + - "traefik.http.middlewares.www-redirect-reverse_vindn.redirectregex.permanent=true" + - "traefik.http.middlewares.www-redirect-reverse_vindn.redirectregex.regex=^http[|s]://${VIRTUAL_HOST}/(.*)" + - "traefik.http.middlewares.www-redirect-reverse_vindn.redirectregex.replacement=https://www.${VIRTUAL_HOST}/$${1}" - admin: - image: adminer - restart: always - depends_on: - - db - ports: - - 5433:8080 \ No newline at end of file +networks: + traefik: + external: true + name: traefik-docker_default