diff --git a/.gitignore b/.gitignore index 50307ad..76ab62c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ node_modules +dist backend/bin/ .vscode *.pem diff --git a/Caddyfile b/Caddyfile new file mode 100644 index 0000000..bf7f7a1 --- /dev/null +++ b/Caddyfile @@ -0,0 +1,5 @@ +rfd.fyi + +file_server + +reverse_proxy /api/* backend:8080 diff --git a/Dockerfile b/Dockerfile index 1c4f2c6..332945a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,11 +10,11 @@ COPY . . RUN yarn build -FROM nginx:stable-alpine as production-stage +FROM caddy:2.5.2-alpine as production-stage -COPY --from=build-stage /app/dist /usr/share/nginx/html +WORKDIR /my-site -COPY nginx.conf /etc/nginx/ +COPY --from=build-stage /app/dist ./ + +COPY Caddyfile /etc/caddy/Caddyfile -EXPOSE 80 -CMD ["nginx", "-g", "daemon off;"] diff --git a/docker-compose.yml b/docker-compose.yml index 3389b11..c588a99 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,8 +3,10 @@ services: frontend: build: dockerfile: Dockerfile + context: . ports: - 80:80 + - 443:443 links: - "backend:backend" backend: diff --git a/nginx.conf b/nginx.conf deleted file mode 100644 index ba1165a..0000000 --- a/nginx.conf +++ /dev/null @@ -1,30 +0,0 @@ -events { - worker_connections 1024; -} - -http { - - upstream backend { - server backend:8080; - } - - server { - listen 80 default_server; - listen [::]:80 default_server; - - location / { - root /usr/share/nginx/html; - } - - location /api/ { - proxy_pass http://backend; - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Host $server_name; - } - - } - -} diff --git a/src/App.vue b/src/App.vue index 259a7a7..f697851 100644 --- a/src/App.vue +++ b/src/App.vue @@ -39,7 +39,7 @@ >