Skip to content

Commit cc3861c

Browse files
committed
Improve binding support for docker-in-docker
1 parent e6e720b commit cc3861c

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

build/wings/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,3 @@ EXPOSE 8080
3636
EXPOSE 2022
3737

3838
WORKDIR /home/root/wings
39-
40-
CMD ["/bin/bash"]

docker-compose.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,12 @@ services:
5454
stdin_open: true
5555
networks:
5656
- pterodactyl
57-
# ports:
58-
# - "2022:2022"
57+
ports:
58+
- "2022:2022"
5959
volumes:
6060
- ./code/wings:/home/root/wings
61-
- wings_data:/var/lib/pterodactyl
61+
- go_modules:/root/go
62+
- /var/lib/pterodactyl:/var/lib/pterodactyl
6263
- /var/run/docker.sock:/var/run/docker.sock:ro
6364
labels:
6465
- "traefik.enable=true"
@@ -130,7 +131,7 @@ volumes:
130131
driver: local
131132
minio:
132133
driver: local
133-
wings_data:
134+
go_modules:
134135
driver: local
135136

136137
x-mutagen:

setup.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ done
1515
mkcert -install
1616
mkcert pterodactyl.test wings.pterodactyl.test minio.pterodactyl.test s3.minio.pterodactyl.test
1717

18+
# Because we're doing Docker-in-Docker we actually need these paths to line
19+
# up correctly with the host system.
20+
sudo mkdir -p /var/lib/pterodactyl
21+
sudo chown $(id -u):$(id -g) /var/lib/pterodactyl
22+
1823
mv -v *pterodactyl.test*-key.pem docker/certificates/pterodactyl.test-key.pem || exit 1
1924
mv -v *pterodactyl.test*.pem docker/certificates/pterodactyl.test.pem || exit 1
2025
cp -v "$(mkcert -CAROOT)/rootCA.pem" docker/certificates/root_ca.pem || exit 1

0 commit comments

Comments
 (0)