Skip to content
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

docker-compose example upgraded to version 2 #212

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

docker-compose example upgraded to version 2 #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion examples/nginx-basic-auth/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
FROM nginx:1.9.9

COPY default.conf /etc/nginx/conf.d/default.conf
COPY users.htpasswd /etc/nginx/users.htpasswd
8 changes: 4 additions & 4 deletions examples/nginx-basic-auth/default.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
upstream dockerui {
server dockerui:9000;
upstream uifd {
server uifd:9000;
}

server {
listen 80;
server_name localhost;

location / {
auth_basic "Docker UI";
auth_basic "UI for Docker";
auth_basic_user_file /etc/nginx/users.htpasswd;

proxy_http_version 1.1;
proxy_set_header Connection "";
proxy_pass http://dockerui;
proxy_pass http://uifd;
}
}
25 changes: 14 additions & 11 deletions examples/nginx-basic-auth/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
dockerui:
image: dockerui/dockerui
privileged: true
volumes:
- /var/run/docker.sock:/var/run/docker.sock
version: '2'
services:
uifd:
image: uifd/ui-for-docker
privileged: true
restart: always
volumes:
- /var/run/docker.sock:/var/run/docker.sock

nginx:
build: .
links:
- dockerui
ports:
- 80:80
nginx:
build: .
links:
- uifd
ports:
- 9999:80