Skip to content

fix: add tigervnc dependency and update DinD for compatibility #199

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

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

fix: add tigervnc dependency and update DinD for compatibility #199

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
12 changes: 8 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ FROM alpine:3.21.3
ADD ./start.sh /start.sh
ADD ./config.ini /config.ini
ADD ./requirements.txt /requirements.txt
COPY dependencies.json /tmp/dependencies.json
COPY ./bin /tmp/bin
# Added tigerVNC to the list as it is required in the v3.0.4 gns3-server.
COPY dependencies.json /tmp/dependencies.json

RUN mkdir /data && \
apk add --no-cache --virtual=build-dependencies jq gcc python3-dev musl-dev linux-headers \
Expand All @@ -14,10 +16,12 @@ RUN mkdir /data && \

CMD [ "/start.sh" ]

# workaround for https://github.com/GNS3/gns3-server/issues/2367
RUN ln -s /bin/busybox /usr/lib/python*/site-packages/gns3server/compute/docker/resources/bin
# Workaround for compatibility issue with alpine's busybox in Docker containers.
# See: https://github.com/GNS3/gns3-server/issues/2069

RUN cp /tmp/bin/busybox /usr/lib/python*/site-packages/gns3server/compute/docker/resources/bin


WORKDIR /data

VOLUME ["/data"]

Binary file added bin/busybox
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion dependencies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
"qemu-system-x86_64": "9.1.2-r1",
"ubridge": "0.9.19-r0",
"util-linux": "2.40.4-r1",
"vpcs": "0.8.3-r0"
"vpcs": "0.8.3-r0",
"tigervnc": "1.13.1-r5"
}
1 change: 1 addition & 0 deletions start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ ip link set dev virbr0 up
if [ "${BRIDGE_ADDRESS}x" == "x" ]; then
BRIDGE_ADDRESS=172.21.1.1/24
fi

ip ad add ${BRIDGE_ADDRESS} dev virbr0
iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE

Expand Down