Skip to content

Commit

Permalink
Add letsencrypt cert renewals.
Browse files Browse the repository at this point in the history
  • Loading branch information
guzman-raphael committed Aug 5, 2019
1 parent c233040 commit 20d796e
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 33 deletions.
52 changes: 26 additions & 26 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,39 +18,39 @@ services:
URL: datajoint.io
SUBDOMAINS: raphaelg
PUBLIC_IP: 192.168.1.205
ports:
- "443:5000"
# ports:
# - "443:5000"
volumes:
# - ./registry/auth:/auth
# - ./registry/data:/data
- /docker-mnt/docker-registry/auth:/auth
- /docker-mnt/docker-registry/data:/data
networks:
- main
#nginx:
# build: ./nginx
# image: registry-nginx:v1.0
# environment:
# - PUID=1000
# - PGID=1000
# - [email protected]
# - URL=datajoint.io
# - SUBDOMAINS=testdev
# - TZ=Europe/London
# - ONLY_SUBDOMAINS=true
# - STAGING=true
# ports:
# - "80:80"
# - "443:443"
# # cap_add:
# # - NET_ADMIN
# # volumes:
# # - ./nginx-letsencrypt/app.conf:/config/nginx/site-confs/app.conf
# networks:
# - main
# depends_on:
# registry:
# condition: service_healthy
nginx:
build: ./nginx
image: registry-nginx:v1.0
environment:
- PUID=1000
- PGID=1000
- [email protected]
- URL=datajoint.io
- SUBDOMAINS=raphaelg
- TZ=Europe/London
- ONLY_SUBDOMAINS=true
- STAGING=true
ports:
- "80:80"
- "443:443"
# cap_add:
# - NET_ADMIN
# volumes:
# - ./nginx-letsencrypt/app.conf:/config/nginx/site-confs/app.conf
networks:
- main
# depends_on:
# registry:
# condition: service_healthy
networks:
main:
ipam:
Expand Down
12 changes: 6 additions & 6 deletions nginx/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ COPY ./entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]

HEALTHCHECK \
--timeout=3s \
--retries=20 \
CMD \
curl --fail https://localhost:443 || exit 1
# curl --fail -k https://localhost:443 || exit 1
# HEALTHCHECK \
# --timeout=3s \
# --retries=20 \
# CMD \
# curl --fail https://localhost:443 || exit 1
# # curl --fail -k https://localhost:443 || exit 1
2 changes: 1 addition & 1 deletion nginx/app.conf
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ server {
include /config/nginx/ssl.conf;

location / {
proxy_pass http://registry:80;
proxy_pass https://registry:5000;
}

}
Expand Down

0 comments on commit 20d796e

Please sign in to comment.