Skip to content

Make the hostname configurable and a bug fix #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
beevelop merged 2 commits into from
Nov 28, 2016
Merged

Make the hostname configurable and a bug fix #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62e5bd5
Make the hostname configurable
np Nov 10, 2016
e4eb534
Remove the default configuration which took priority
np Nov 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
FROM nginx:alpine

ENV HTPASSWD='foo:$apr1$odHl5EJN$KbxMfo86Qdve2FH4owePn.' \
FORWARD_PORT=80
FORWARD_PORT=80 \
FORWARD_HOST=web

WORKDIR /opt

Expand Down
6 changes: 3 additions & 3 deletions auth.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
server {
listen 80 default_server;

location / {
auth_basic "Restricted";
auth_basic_user_file auth.htpasswd;

proxy_pass http://web:${FORWARD_PORT};
proxy_pass http://${FORWARD_HOST}:${FORWARD_PORT};
proxy_read_timeout 900;
}
}
}
1 change: 1 addition & 0 deletions launch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/sh

rm /etc/nginx/conf.d/default.conf || :
envsubst < auth.conf > /etc/nginx/conf.d/auth.conf
envsubst < auth.htpasswd > /etc/nginx/auth.htpasswd

Expand Down