Merge pull request #94 from lucor/release/v1.2.0

Release v1.2.0

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog - Fyne.io fyne-cross
 
+## 1.2.0 - 07 Mar 2022
+
+### Added
+
+- Add support for FyneApp.toml #78
+- Add the ability to use podman #41
+- Update to use fixuid to handle mount permissions #42
+
 ## 1.1.3 - 02 Nov 2021
 
 ### Fixed

Makefile

@@ -1,80 +1,103 @@
 tag := $(shell date +"%y.%m.%d")
+RUNNER := $(shell 2>/dev/null 1>&2 docker version && echo "docker" || echo "podman")
+REGISTRY := docker.io
+FYNE_CROSS_VERSION := "1.2"
 
-FYNE_CROSS_VERSION := "1.1"
 
 base:
-	@docker build -f ${CURDIR}/docker/base/Dockerfile -t fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base .
+	@$(RUNNER) build -f ${CURDIR}/docker/base/Dockerfile -t fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base .
 
 base-llvm: base
-	@docker build --build-arg FYNE_CROSS_VERSION=${FYNE_CROSS_VERSION} -f ${CURDIR}/docker/base-llvm/Dockerfile -t fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-llvm .
+	@$(RUNNER) build --build-arg FYNE_CROSS_VERSION=${FYNE_CROSS_VERSION} -f ${CURDIR}/docker/base-llvm/Dockerfile -t fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-llvm .
 
 android: base
-	@docker build --build-arg FYNE_CROSS_VERSION=${FYNE_CROSS_VERSION} -f ${CURDIR}/docker/android/Dockerfile -t fyneio/fyne-cross:${FYNE_CROSS_VERSION}-android .
+	@$(RUNNER) build --build-arg FYNE_CROSS_VERSION=${FYNE_CROSS_VERSION} -f ${CURDIR}/docker/android/Dockerfile -t fyneio/fyne-cross:${FYNE_CROSS_VERSION}-android .
 
 darwin: base-llvm
-	@docker build --build-arg FYNE_CROSS_VERSION=${FYNE_CROSS_VERSION} -f ${CURDIR}/docker/darwin/Dockerfile -t fyneio/fyne-cross:${FYNE_CROSS_VERSION}-darwin .
+	@$(RUNNER) build --build-arg FYNE_CROSS_VERSION=${FYNE_CROSS_VERSION} -f ${CURDIR}/docker/darwin/Dockerfile -t fyneio/fyne-cross:${FYNE_CROSS_VERSION}-darwin .
 
 base-freebsd: base-llvm
-	@docker build --build-arg FYNE_CROSS_VERSION=${FYNE_CROSS_VERSION} -f ${CURDIR}/docker/base-freebsd/Dockerfile -t fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-freebsd .
+	@$(RUNNER) build --build-arg FYNE_CROSS_VERSION=${FYNE_CROSS_VERSION} -f ${CURDIR}/docker/base-freebsd/Dockerfile -t fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-freebsd .
 
 freebsd: base-freebsd
-	@docker build --build-arg FYNE_CROSS_VERSION=${FYNE_CROSS_VERSION} -f ${CURDIR}/docker/freebsd-amd64/Dockerfile -t fyneio/fyne-cross:${FYNE_CROSS_VERSION}-freebsd-amd64 .
-	@docker build --build-arg FYNE_CROSS_VERSION=${FYNE_CROSS_VERSION} -f ${CURDIR}/docker/freebsd-arm64/Dockerfile -t fyneio/fyne-cross:${FYNE_CROSS_VERSION}-freebsd-arm64 .
+	@$(RUNNER) build --build-arg FYNE_CROSS_VERSION=${FYNE_CROSS_VERSION} -f ${CURDIR}/docker/freebsd-amd64/Dockerfile -t fyneio/fyne-cross:${FYNE_CROSS_VERSION}-freebsd-amd64 .
+	@$(RUNNER) build --build-arg FYNE_CROSS_VERSION=${FYNE_CROSS_VERSION} -f ${CURDIR}/docker/freebsd-arm64/Dockerfile -t fyneio/fyne-cross:${FYNE_CROSS_VERSION}-freebsd-arm64 .
 
 linux: base
-	@docker build --build-arg FYNE_CROSS_VERSION=${FYNE_CROSS_VERSION} -f ${CURDIR}/docker/linux-386/Dockerfile -t fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-386 .
-	@docker build --build-arg FYNE_CROSS_VERSION=${FYNE_CROSS_VERSION} -f ${CURDIR}/docker/linux-arm/Dockerfile -t fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-arm .
-	@docker build --build-arg FYNE_CROSS_VERSION=${FYNE_CROSS_VERSION} -f ${CURDIR}/docker/linux-arm64/Dockerfile -t fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-arm64 .
+	@$(RUNNER) build --build-arg FYNE_CROSS_VERSION=${FYNE_CROSS_VERSION} -f ${CURDIR}/docker/linux-386/Dockerfile -t fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-386 .
+	@$(RUNNER) build --build-arg FYNE_CROSS_VERSION=${FYNE_CROSS_VERSION} -f ${CURDIR}/docker/linux-arm/Dockerfile -t fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-arm .
+	@$(RUNNER) build --build-arg FYNE_CROSS_VERSION=${FYNE_CROSS_VERSION} -f ${CURDIR}/docker/linux-arm64/Dockerfile -t fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-arm64 .
 
 windows: base
-	@docker build --build-arg FYNE_CROSS_VERSION=${FYNE_CROSS_VERSION} -f ${CURDIR}/docker/windows/Dockerfile -t fyneio/fyne-cross:${FYNE_CROSS_VERSION}-windows .
+	@$(RUNNER) build --build-arg FYNE_CROSS_VERSION=${FYNE_CROSS_VERSION} -f ${CURDIR}/docker/windows/Dockerfile -t fyneio/fyne-cross:${FYNE_CROSS_VERSION}-windows .
 
 # build all images for release. Note do not build darwin
 build-images: base android freebsd linux windows
+ifeq ($(RUNNER),podman)
+	$(MAKE) podman-tag
+endif
 
 # tag the images with the YY.MM.DD suffix
 tag-images:
 	# tag base images
-	@docker tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-$(tag)
-	@docker tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-llvm fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-llvm-$(tag)
-	@docker tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-freebsd fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-freebsd-$(tag)
+	@$(RUNNER) tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-$(tag)
+	@$(RUNNER) tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-llvm fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-llvm-$(tag)
+	@$(RUNNER) tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-freebsd fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-freebsd-$(tag)
 	# tag android images
-	@docker tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-android fyneio/fyne-cross:${FYNE_CROSS_VERSION}-android-$(tag)
+	@$(RUNNER) tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-android fyneio/fyne-cross:${FYNE_CROSS_VERSION}-android-$(tag)
 	# tag linux images
-	@docker tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-386 fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-386-$(tag)
-	@docker tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-arm fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-arm-$(tag)
-	@docker tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-arm64 fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-arm64-$(tag)
+	@$(RUNNER) tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-386 fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-386-$(tag)
+	@$(RUNNER) tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-arm fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-arm-$(tag)
+	@$(RUNNER) tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-arm64 fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-arm64-$(tag)
 	# tag freebsd images
-	@docker tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-freebsd-amd64 fyneio/fyne-cross:${FYNE_CROSS_VERSION}-freebsd-amd64-$(tag)
-	@docker tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-freebsd-arm64 fyneio/fyne-cross:${FYNE_CROSS_VERSION}-freebsd-arm64-$(tag)
+	@$(RUNNER) tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-freebsd-amd64 fyneio/fyne-cross:${FYNE_CROSS_VERSION}-freebsd-amd64-$(tag)
+	@$(RUNNER) tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-freebsd-arm64 fyneio/fyne-cross:${FYNE_CROSS_VERSION}-freebsd-arm64-$(tag)
 	# tag windows images
-	@docker tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-windows fyneio/fyne-cross:${FYNE_CROSS_VERSION}-windows-$(tag)
+	@$(RUNNER) tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-windows fyneio/fyne-cross:${FYNE_CROSS_VERSION}-windows-$(tag)
+
+podman-tag:
+	# tag base images
+	@$(RUNNER) tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base $(REGISTRY)/fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base
+	@$(RUNNER) tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-llvm $(REGISTRY)/fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-llvm
+	@$(RUNNER) tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-freebsd $(REGISTRY)/fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-freebsd
+	# tag android images
+	@$(RUNNER) tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-android $(REGISTRY)/fyneio/fyne-cross:${FYNE_CROSS_VERSION}-android
+	# tag linux images
+	@$(RUNNER) tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-386 $(REGISTRY)/fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-386
+	@$(RUNNER) tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-arm $(REGISTRY)/fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-arm
+	@$(RUNNER) tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-arm64 $(REGISTRY)/fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-arm64
+	# tag freebsd images
+	@$(RUNNER) tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-freebsd-amd64 $(REGISTRY)/fyneio/fyne-cross:${FYNE_CROSS_VERSION}-freebsd-amd64
+	@$(RUNNER) tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-freebsd-arm64 $(REGISTRY)/fyneio/fyne-cross:${FYNE_CROSS_VERSION}-freebsd-arm64
+	# tag windows images
+	@$(RUNNER) tag fyneio/fyne-cross:${FYNE_CROSS_VERSION}-windows $(REGISTRY)/fyneio/fyne-cross:${FYNE_CROSS_VERSION}-windows
+
 
 # push the latest images
 push-latest-images:
-	@docker push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base
-	@docker push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-llvm
-	@docker push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-freebsd
-	@docker push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-android
-	@docker push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-386
-	@docker push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-arm
-	@docker push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-arm64
-	@docker push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-freebsd-amd64
-	@docker push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-freebsd-arm64
-	@docker push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-windows
+	@$(RUNNER) push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base
+	@$(RUNNER) push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-llvm
+	@$(RUNNER) push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-freebsd
+	@$(RUNNER) push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-android
+	@$(RUNNER) push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-386
+	@$(RUNNER) push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-arm
+	@$(RUNNER) push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-arm64
+	@$(RUNNER) push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-freebsd-amd64
+	@$(RUNNER) push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-freebsd-arm64
+	@$(RUNNER) push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-windows
 
 # push the tagged images
 push-tag-images:
-	@docker push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-$(tag)
-	@docker push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-llvm-$(tag)
-	@docker push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-freebsd-$(tag)
-	@docker push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-android-$(tag)
-	@docker push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-386-$(tag)
-	@docker push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-arm-$(tag)
-	@docker push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-arm64-$(tag)
-	@docker push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-freebsd-amd64-$(tag)
-	@docker push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-freebsd-arm64-$(tag)
-	@docker push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-windows-$(tag)
+	@$(RUNNER) push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-$(tag)
+	@$(RUNNER) push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-llvm-$(tag)
+	@$(RUNNER) push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-freebsd-$(tag)
+	@$(RUNNER) push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-android-$(tag)
+	@$(RUNNER) push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-386-$(tag)
+	@$(RUNNER) push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-arm-$(tag)
+	@$(RUNNER) push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-linux-arm64-$(tag)
+	@$(RUNNER) push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-freebsd-amd64-$(tag)
+	@$(RUNNER) push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-freebsd-arm64-$(tag)
+	@$(RUNNER) push fyneio/fyne-cross:${FYNE_CROSS_VERSION}-windows-$(tag)
 
 # push all images: latest and tagged 
 push-images: push-latest-images push-tag-images

docker/CHANGELOG.md

@@ -2,6 +2,35 @@
 
 All notable changes to the fyne-cross docker images will be documented in this file.
 
+## fyne 1.2.x compatible
+
+Latest versions available on Docker Hub are:
+
+- fyneio/fyne-cross:1.2-base
+- fyneio/fyne-cross:1.2-base-llvm
+- fyneio/fyne-cross:1.2-base-freebsd
+- fyneio/fyne-cross:1.2-android
+- fyneio/fyne-cross:1.2-freebsd-amd64
+- fyneio/fyne-cross:1.2-freebsd-arm64
+- fyneio/fyne-cross:1.2-linux-386
+- fyneio/fyne-cross:1.2-linux-arm64
+- fyneio/fyne-cross:1.2-linux-arm
+- fyneio/fyne-cross:1.2-windows
+
+Release cycle won't follow the fyne-cross one, so the images will be tagged and
+available on Docker Hub using the label year.month.day along with the tags
+above.
+
+Example: `fyneio/fyne-cross:1.2-base-22.02.28`
+
+## Release 22.03.05
+- Update Go to v1.17.8
+
+## Release 22.02.28
+- Update Go to v1.17.7
+- Update fyne CLI to v2.1.3
+- Add fixuid to handle volume mount permissions
+
 ## fyne 1.1.x compatible
 
 Latest versions available on Docker Hub are:
@@ -23,6 +52,13 @@ above.
 
 Example: `fyneio/fyne-cross:1.1-base-21.03.17`
 
+## Release 22.01.10
+- Update Go to v1.17.6
+
+## Release 21.12.07
+- Update Go to v1.17.4
+- Update fyne CLI to v2.1.2
+
 ## Release 21.10.05
 - Add xz-utils package to support unix packaging fyne-io/fyne#1919
 

docker/base/Dockerfile

@@ -1,15 +1,18 @@
-ARG GO_VERSION=1.16.8
+ARG GO_VERSION=1.17.8
 # fyne stable branch
-ARG FYNE_VERSION=v2.1.0
+ARG FYNE_VERSION=v2.1.3
+
+ARG FIXUID_VERSION=0.5.1
 
 FROM golang:${GO_VERSION}-buster AS tools
 ARG FYNE_VERSION
 
 # Install the fyne CLI tool
-RUN go get -ldflags="-w -s" -v "fyne.io/fyne/v2/cmd/fyne@${FYNE_VERSION}"
+RUN go install -ldflags="-w -s" -v "fyne.io/fyne/v2/cmd/fyne@${FYNE_VERSION}"
 
 # Build the fyne-cross base image
 FROM golang:${GO_VERSION}-buster AS base
+ARG FIXUID_VERSION
 
 COPY --from=tools /go/bin/fyne /usr/local/bin
 
@@ -33,6 +36,11 @@ RUN apt-get update -qq \
     && apt-get clean \
     && rm -r /var/lib/apt/lists/*;
 
-COPY ./docker/base/docker-entrypoint.sh /usr/local/bin
-
-ENTRYPOINT [ "/usr/local/bin/docker-entrypoint.sh"]
+# Install fixuid see #41
+RUN addgroup --gid 1000 docker; \
+    adduser --uid 1000 --ingroup docker --home /home/docker --shell /bin/sh --disabled-password --gecos "" docker; \
+    curl -SsL https://github.com/boxboat/fixuid/releases/download/v${FIXUID_VERSION}/fixuid-${FIXUID_VERSION}-linux-amd64.tar.gz | tar -C /usr/local/bin -xzf -; \
+    chown root:root /usr/local/bin/fixuid; \
+    chmod 4755 /usr/local/bin/fixuid; \
+    mkdir -p /etc/fixuid; \
+    printf "user: docker\ngroup: docker\n" > /etc/fixuid/config.yml

docker/darwin/Dockerfile

@@ -1,10 +1,10 @@
 ARG LLVM_VERSION=12
 ARG OSX_VERSION_MIN=10.12
 ARG OSX_CROSS_COMMIT="8a716a43a72dab1db9630d7824ee0af3730cb8f9"
-ARG FYNE_CROSS_VERSION=1.1
+ARG FYNE_CROSS_VERSION=1.2
 
 ## Build osxcross toolchain
-FROM fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-llvm as osxcross
+FROM docker.io/fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-llvm as osxcross
 ARG OSX_CROSS_COMMIT
 ARG OSX_VERSION_MIN
 
@@ -40,7 +40,7 @@ RUN UNATTENDED=yes SDK_VERSION=${SDK_VERSION} OSX_VERSION_MIN=${OSX_VERSION_MIN}
 
 
 ## Build darwin-latest image
-FROM fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-llvm
+FROM docker.io/fyneio/fyne-cross:${FYNE_CROSS_VERSION}-base-llvm
 
 COPY --from=osxcross /osxcross/target /osxcross/target
 ENV PATH=/osxcross/target/bin:$PATH

go.mod

@@ -3,7 +3,8 @@ module github.com/fyne-io/fyne-cross
 go 1.13
 
 require (
+	github.com/BurntSushi/toml v1.0.0
 	github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9
-	github.com/stretchr/testify v1.6.1
-	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c
+	github.com/stretchr/testify v1.7.0
+	golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9
 )

go.sum

@@ -1,14 +1,16 @@
+github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU=
+github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9 h1:1ltqoej5GtaWF8jaiA49HwsZD459jqm9YFz9ZtMFpQA=
 github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9/go.mod h1:7uhhqiBaR4CpN0k9rMjOtjpcfGd6DG2m04zQxKnWQ0I=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 h1:nhht2DYV/Sn3qOayu8lM+cU1ii9sTLUeBQwQQfUHtrs=
+golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=

internal/command/android.go

@@ -14,7 +14,7 @@ const (
 	// androidOS is the android OS name
 	androidOS = "android"
 	// androidImage is the fyne-cross image for the Android OS
-	androidImage = "fyneio/fyne-cross:1.1-android"
+	androidImage = "docker.io/fyneio/fyne-cross:1.2-android"
 )
 
 var (
@@ -71,13 +71,18 @@ func (cmd *Android) Run() error {
 
 	for _, ctx := range cmd.Context {
 
+		err := bumpFyneAppBuild(ctx)
+		if err != nil {
+			log.Infof("[i] FyneApp.toml: unable to bump the build number. Error: %s", err)
+		}
+
 		log.Infof("[i] Target: %s/%s", ctx.OS, ctx.Architecture)
 		log.Debugf("%#v", ctx)
 
 		//
 		// pull image, if requested
 		//
-		err := pullImage(ctx)
+		err = pullImage(ctx)
 		if err != nil {
 			return err
 		}

internal/command/command.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/fyne-io/fyne-cross/internal/icon"
 	"github.com/fyne-io/fyne-cross/internal/log"
+	"github.com/fyne-io/fyne-cross/internal/metadata"
 	"github.com/fyne-io/fyne-cross/internal/volume"
 	"golang.org/x/sys/execabs"
 )
@@ -238,3 +239,14 @@ func fyneReleaseHost(ctx Context) error {
 	}
 	return nil
 }
+
+// bumpFyneAppBuild increments the BuildID into the FyneApp.toml, if any,
+// to behave like the fyne CLI tool
+func bumpFyneAppBuild(ctx Context) error {
+	data, err := metadata.LoadStandard(ctx.Volume.WorkDirHost())
+	if err != nil {
+		return nil // no metadata to update
+	}
+	data.Details.Build++
+	return metadata.SaveStandard(data, ctx.Volume.WorkDirHost())
+}

internal/command/darwin.go

@@ -20,7 +20,7 @@ var (
 	// darwinArchSupported defines the supported target architectures on darwin
 	darwinArchSupported = []Architecture{ArchAmd64, ArchArm64}
 	// darwinImage is the fyne-cross image for the Darwin OS
-	darwinImage = "fyneio/fyne-cross:1.1-darwin"
+	darwinImage = "docker.io/fyneio/fyne-cross:1.2-darwin"
 )
 
 // Darwin build and package the fyne app for the darwin OS
@@ -79,13 +79,18 @@ func (cmd *Darwin) Run() error {
 
 	for _, ctx := range cmd.Context {
 
+		err := bumpFyneAppBuild(ctx)
+		if err != nil {
+			log.Infof("[i] FyneApp.toml: unable to bump the build number. Error: %s", err)
+		}
+
 		log.Infof("[i] Target: %s/%s", ctx.OS, ctx.Architecture)
 		log.Debugf("%#v", ctx)
 
 		//
 		// pull image, if requested
 		//
-		err := pullImage(ctx)
+		err = pullImage(ctx)
 		if err != nil {
 			return err
 		}