Skip to content

Commit

Permalink
bugfixes, adding acme static dir to ignore
Browse files Browse the repository at this point in the history
  • Loading branch information
chiefy committed Oct 20, 2017
1 parent 1641315 commit 8c5ee47
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1,3 +1,4 @@
bin
vendor/**/
nginx/**/
static/.well-known
14 changes: 9 additions & 5 deletions Makefile
Expand Up @@ -23,7 +23,7 @@ nginx/certs/default.crt: nginx/certs
-days 365 \
-keyout nginx/certs/default.key \
-nodes \
-subj "/C=US/ST=Oregon/L=Portland/O=Company Name/OU=Org/CN=localhost" \
-subj "/C=US/ST=Oregon/L=Portland/O=Localhost LLC/OU=Org/CN=localhost" \
-out $@

.PHONY: build
Expand All @@ -40,12 +40,16 @@ clean:
@rm -f bin/*
@docker-compose rm -fv

run-local: clean build nginx.tmpl nginx/certs/default.crt
@docker-compose up --build -d
run-local: clean build nginx/certs/default.crt
@NGINX_CONF_PATH=$(PWD)/nginx \
STATIC_FILES_PATH=$(PWD)/static \
docker-compose up --build -d

.PHONY: run
run: clean build nginx.tmpl
@docker-compose up --build -d
run: clean build
@NGINX_CONF_PATH=$(PWD)/nginx \
STATIC_FILES_PATH=$(PWD)/static \
docker-compose up --build -d

.PHONY: stop
stop:
Expand Down
3 changes: 1 addition & 2 deletions docker-compose.yml
Expand Up @@ -22,7 +22,6 @@ services:
VIRTUAL_HOST: "${VIRTUAL_HOST}"
VIRTUAL_PROTO: "http"
VIRTUAL_PORT: 1234
CERT_NAME: "default"
expose:
- 1234

Expand Down Expand Up @@ -57,7 +56,7 @@ services:
- ${STATIC_FILES_PATH}:/usr/share/nginx/html
- ${NGINX_CONF_PATH}/certs:/etc/nginx/certs:ro
- /var/run/docker.sock:/tmp/docker.sock:ro
- ./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro
- ./nginx/nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro

nginx-letsencrypt:
image: jrcs/letsencrypt-nginx-proxy-companion
Expand Down

0 comments on commit 8c5ee47

Please sign in to comment.