Merge branch 'main' into gotty

Author: hellt

Dockerfile

@@ -20,7 +20,7 @@ RUN     apk update \
     iproute2 iputils jq lftp mtr mysql-client net-tools netcat-openbsd \
     nginx nmap openntpd openssh-client openssl perl-net-telnet \
     postgresql-client procps rsync socat sudo tcpdump tcptraceroute \
-    tshark wget envsubst\
+    tshark wget envsubst scapy liboping fping \
     &&  mkdir /certs /docker \
     &&  chmod 700 /certs \
     &&  openssl req \
@@ -32,6 +32,8 @@ RUN mkdir -p /usr/local/gobgp
 RUN tar -C /usr/local/gobgp -xzf gobgp_3.25.0_linux_amd64.tar.gz
 RUN cp /usr/local/gobgp/gobgp* /usr/bin/
 
+COPY --from=builder /usr/local/bin/mcjoin /usr/local/bin/
+
 RUN rm /etc/motd
 
 ###