Skip to content

Commit

Permalink
WIP: Re-enable userns isolation.
Browse files Browse the repository at this point in the history
This reverts commit 447f548.
This would close #6.
  • Loading branch information
YtvwlD committed Aug 10, 2019
1 parent a5dcdda commit dad91a4
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Vagrant.configure("2") do |config|
config.vm.box = "ubuntu/bionic64"
config.vm.provider :virtualbox do |v|
v.memory = 1500
v.memory = 768
end

config.vm.network :forwarded_port, host: 8080, guest: 80
Expand All @@ -11,6 +11,7 @@ Vagrant.configure("2") do |config|
apt-get install -y docker.io
adduser vagrant docker
systemctl enable docker.service
echo '{"userns-remap": "default"}' > /etc/docker/daemon.json
docker swarm init
docker network create --driver overlay traefik_net
echo "foo" | docker secret create DASHING_AUTH_TOKEN -
Expand Down
4 changes: 2 additions & 2 deletions disabled/portainer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ services:
# AGENT_PORT: 9001
# LOG_LEVEL: debug
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- /var/lib/docker/volumes:/var/lib/docker/volumes
- /var/run/docker-userns.sock:/var/run/docker.sock
- /var/lib/docker/165536.165536/volumes:/var/lib/docker/volumes
networks:
- internal
deploy:
Expand Down
4 changes: 2 additions & 2 deletions disabled/swarmpit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
environment:
- SWARMPIT_DB=http://db:5984
volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro
- /var/run/docker-userns.sock:/var/run/docker.sock:ro
networks:
- internal
- traefik
Expand Down Expand Up @@ -34,7 +34,7 @@ services:
environment:
- DOCKER_API_VERSION=1.35
volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro
- /var/run/docker-userns.sock:/var/run/docker.sock:ro
networks:
- internal
deploy:
Expand Down
2 changes: 1 addition & 1 deletion enabled/traefik.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
- CF_API_KEY
- TRAEFIK_DIGEST_AUTH
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- /var/run/docker-userns.sock:/var/run/docker.sock
- acme:/etc/traefik/acme
- tmp:/tmp
networks:
Expand Down

0 comments on commit dad91a4

Please sign in to comment.