Merge pull request #2483 from zx2c4/custom-wg-script

wireguard: use custom wg-quick

pkg/getty/Dockerfile

@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror
+FROM linuxkit/alpine:1e67b8fdba849ed2f7e8537c13b7f280639623d6 AS mirror
 
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out \

pkg/ip/Dockerfile

@@ -1,5 +1,6 @@
-FROM linuxkit/alpine:a120ad6aead3fe583eaa20e9b75a05ac1b3487da AS mirror
+FROM linuxkit/alpine:1e67b8fdba849ed2f7e8537c13b7f280639623d6 AS mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
+RUN apk add curl
 RUN apk add --no-cache --initdb -p /out \
     alpine-baselayout \
     bash \
@@ -8,6 +9,9 @@ RUN apk add --no-cache --initdb -p /out \
     musl \
     wireguard-tools
 
+# We grab our version of wg-quick, called lk-wg-config.sh
+RUN curl -sSL -o /out/usr/bin/lk-wg-config https://gist.githubusercontent.com/zx2c4/3624de869ab7eaef3de5ea8f2b867be9/raw/de72b018f4f4548858ce6aae2898b34db0474221/lk-wg-config.sh && chmod 755 /out/usr/bin/lk-wg-config
+
 # Remove apk residuals
 RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
 

pkg/ip/Makefile

@@ -1,3 +1,4 @@
 IMAGE=ip
+NETWORK=1
 
 include ../package.mk