wip docker buidls

docker/Dockerfile

 # An image to build and package the BitmaskVPN (RiseupVPN and other branded builds)
-# (c) LEAP Encryption Access Project 2018-2021
+# (c) LEAP Encryption Access Project 2018-2023
 
-FROM ubuntu:20.04 as builder
+FROM ubuntu:22.04 as builder
 
 MAINTAINER LEAP Encryption Access Project <info@leap.se>
-ARG GO_VERSION=1.16
+ARG GO_VERSION=1.17
 LABEL Description="An image to build Bitmask Lite" Vendor="LEAP" Version="1.2"
 ENV OSXSDK_SHA256="631b4144c6bf75bf7a4d480d685a9b5bda10ee8d03dbf0db829391e2ef858789" \
     PATH="$PATH:/osxcross/target/bin:/usr/lib/go-${GO_VERSION}/bin"
@@ -17,7 +17,7 @@ RUN apt-get update && apt-get upgrade --yes && \
             git curl wget \
             libappindicator3-dev libgtk-3-dev \
             webkit2gtk-4.0 \
-            mingw-w64 upx-ucl python snapd \
+            mingw-w64 upx-ucl python3 snapd \
             unzip sudo locales \
             devscripts fakeroot debhelper \
             clang llvm-dev libxml2-dev uuid-dev \
@@ -26,7 +26,7 @@ RUN apt-get update && apt-get upgrade --yes && \
             software-properties-common dh-golang \
             jq \
             squashfs-tools \
-            qtbase5-dev qttools5-dev-tools qt5-qmake g++ qtdeclarative5-dev qt5-default \
+            qtbase5-dev qttools5-dev-tools qt5-qmake g++ qtdeclarative5-dev qtbase5-dev  \
             golang-${GO_VERSION}-go golang-go golang-golang-x-tools-dev && \
     rm -r /var/lib/apt/lists/*
 
@@ -43,10 +43,12 @@ RUN git clone https://github.com/hogliux/bomutils && \
     cd bomutils && make && sudo make install
 
 # xar (for osx packaging)
-RUN git clone https://github.com/VantaInc/xar && \
-    cd xar/xar && \
-    ./autogen.sh && ./configure && \
-    make && sudo make install
+# there's no xar deb package, it's abandonware
+# see 
+# RUN git clone https://github.com/VantaInc/xar && \
+#     cd xar/xar && \
+#     ./autogen.sh && ./configure && \
+#     make && sudo make install
 
 # Grab the core18 and core20 snap (which snapcraft uses as a base) from the stable channel
 # and unpack it in the proper place, to speed up snapcraft builds in the containers.
@@ -75,9 +77,9 @@ RUN ln -s /snap/bin/snapcraft /bin/
 
 # cache go modules
 RUN rm -rf /gomods && mkdir -p /gomods/packages
+COPY mods/packages/ /gomods/packages/
 WORKDIR /gomods
 COPY mods/go.* /gomods/
-COPY mods/packages/ /gomods/packages/
 RUN go mod download
 
 COPY builder.sh /

docker/Makefile

@@ -17,7 +17,7 @@ SIGNCODE=osslsigncode
 SECRETS="leap/secrets/windoze"
 
 build: 
-	mkdir -p mods && cp ../go.mod ../go.sum mods/ && cp -r ../packages mods/
+	mkdir -p mods && cp ../go.mod ../go.sum mods/ && touch ../packages && cp -r ../packages mods/
 	docker build -t $(REGISTRY)/$(IMAGE):latest .
 deps:
 	sudo apt install osslsigncode

docker/README.md

 You can use the makefile to build the image.
 
+Need to install docker and make.
 "make packages" will build packages inside the builder container.
 
 Use https://github.com/kalikaneko/squid-in-a-can if you want to save some bandwith while building your images.