Skip to content
This repository has been archived by the owner on Jul 23, 2024. It is now read-only.

Commit

Permalink
Prep for Caddy and new hosting.
Browse files Browse the repository at this point in the history
  • Loading branch information
pablooliva committed Aug 20, 2021
1 parent 5db9304 commit 2c61f0e
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 35 deletions.
2 changes: 1 addition & 1 deletion Dockerfile-prod → Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ COPY --from=build-stage /app/nginx/nginx-custom.conf /etc/nginx/conf.d/default.c
# COPY --from=build-stage /app/nginx/ssl.conf /etc/nginx/conf.d/ssl.conf
COPY --from=build-stage /app/nginx/mime.types /etc/nginx/conf.d/mime.types
RUN mkdir -p /etc/nginx/logs
EXPOSE 80
EXPOSE 8080
CMD ["nginx", "-g", "daemon off;"]
19 changes: 0 additions & 19 deletions docker-compose-clnt-prod.yml

This file was deleted.

13 changes: 13 additions & 0 deletions docker-compose-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
version: '3'

services:
clnt-dev:
build:
context: .
dockerfile: Dockerfile-dev
container_name: chcklst-client-dev
command: npm start
volumes:
- '.:/app'
ports:
- '4200:4200'
18 changes: 18 additions & 0 deletions docker-compose-stage.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
version: '3'

networks:
web:
external: true

services:
clnt-stage:
build:
context: .
container_name: chcklst-client-stage
command: nginx -g 'daemon off;'
volumes:
- './nginx/nginx-custom-local.conf:/etc/nginx/conf.d/default.conf'
ports:
- '8080:8080'
networks:
- web
19 changes: 6 additions & 13 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,15 @@ networks:
external: true

services:
clnt-dev:
clnt-prod:
build:
context: .
dockerfile: Dockerfile-dev
container_name: chcklst-client
command: npm start
volumes:
- '.:/app'
ports:
- '4200:4200'
clnt-stage:
image: 'pablooliva/ch.ckl.st-client:latest'
container_name: chcklst-client-prod
restart: always
command: nginx -g 'daemon off;'
ports:
- '8080:8080'
volumes:
- './nginx/nginx-custom-local.conf:/etc/nginx/conf.d/default.conf'
- /home/chcklst/client/nginx-logs:/etc/nginx/logs
expose:
- 8080
networks:
- web
4 changes: 2 additions & 2 deletions nginx/nginx-custom.conf
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ server {

server {
server_name ch.ckl.st;
listen 80 http2;
listen [::]:80 http2;
listen 8080 http2;
listen [::]:8080 http2;
location ~* /\.(?!well-known\/) {
deny all;
}
Expand Down

0 comments on commit 2c61f0e

Please sign in to comment.