minor fixes

Author: NickeZ

.containerversion

@@ -1 +1 @@
-28
+29

Dockerfile

@@ -11,25 +11,21 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-FROM thyrlian/android-sdk:4.0 as android
+FROM thyrlian/android-sdk:4.0 AS android
 
 FROM ubuntu:22.04
 
-ENV DEBIAN_FRONTEND noninteractive
-
 # Android
 COPY --from=android /opt/android-sdk /opt/android-sdk
 
-ADD scripts/docker_install.sh /tmp/
-RUN /tmp/docker_install.sh
+RUN --mount=target=/mnt,source=scripts DEBIAN_FRONTEND=noninteractive /mnt/docker_install.sh
 
 # In this path executables will be installed during docker build
-ARG SYS_GOPATH /opt/go
-ENV PATH $SYS_GOPATH/bin:/usr/local/go/bin:$PATH
+ARG SYS_GOPATH=/opt/go
+ENV PATH=${SYS_GOPATH}/bin:/usr/local/go/bin:$PATH
 
-ADD Makefile /tmp/
-RUN GOPATH=$SYS_GOPATH make -C /tmp/ envinit
+RUN --mount=target=/mnt/Makefile,source=Makefile GOPATH=${SYS_GOPATH} make -C /mnt envinit
 
-ENV PATH /opt/qt6/6.8.2/gcc_64/bin:/opt/qt6/6.8.2/gcc_64/libexec:$PATH
+ENV PATH=/opt/qt6/6.8.2/gcc_64/bin:/opt/qt6/6.8.2/gcc_64/libexec:$PATH
 
 CMD ["bash"]

Makefile

@@ -82,8 +82,11 @@ clean:
 	cd frontends/qt && $(MAKE) clean
 	cd frontends/android && $(MAKE) clean
 	cd backend/mobileserver && $(MAKE) clean
+
+# The container image only supports amd64 bercause of "thyrlian/android-sdk"
+# that downloads amd64 specific binaries
 dockerinit:
-	./scripts/container.sh build --pull --force-rm -t shiftcrypto/bitbox-wallet-app .
+	./scripts/container.sh build --platform linux/amd64 --pull -t shiftcrypto/bitbox-wallet-app:$(shell cat .containerversion) .
 dockerdev:
 	./scripts/dockerdev.sh
 locize-push:

scripts/github-ci.sh

@@ -12,7 +12,7 @@ if [ "$OS_NAME" == "linux" ]; then
     # Which docker image to use to run the CI. Defaults to Docker Hub.
     # Overwrite with CI_IMAGE=docker/image/path environment variable.
     # Keep this in sync with .github/workflows/ci.yml.
-    : "${CI_IMAGE:=shiftcrypto/bitbox-wallet-app:26}"
+    : "${CI_IMAGE:=shiftcrypto/bitbox-wallet-app:$(cat .containerversion)}"
     # Time image pull to compare in the future.
     time docker pull "$CI_IMAGE"
 
@@ -32,14 +32,12 @@ if [ "$OS_NAME" == "osx" ]; then
     # GitHub CI installs Go and Qt directly in the macos action, before executing
     # this script.
     go version
-    export GOPATH=~/go
-    export PATH="$PATH:~/go/bin"
-    mkdir -p $GOPATH/$(dirname $GO_SRC_DIR)
+    export PATH="~/go/bin:$PATH"
+    mkdir -p $(go env GOPATH)/$(dirname $GO_SRC_DIR)
     # GitHub checkout action (git clone) seem to require current work dir
     # to be the root of the repo during its clean up phase. So, we push it
     # here and pop in the end.
-    pushd ../ && cp -a bitbox-wallet-app $GOPATH/$(dirname $GO_SRC_DIR)
-    cd $GOPATH/$GO_SRC_DIR
-    make "$WHAT"
+    pushd ../ && cp -a bitbox-wallet-app $(go env GOPATH/)$(dirname $GO_SRC_DIR)
+    make -C $(go env GOPATH)/$GO_SRC_DIR "$WHAT"
     popd
 fi