Merge pull request #12 from fyne-io/bugs/podman-build-and-push

Bugs/podman build and push
fyne-io · Mar 20, 2023 · 3531b80 · 3531b80
2 parents c809eae + 6c797f9
commit 3531b80
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 27 deletions.
diff --git a/Makefile b/Makefile
@@ -12,7 +12,7 @@ base:
 	@$(RUNNER) tag ${REPOSITORY}:${VERSION}-base ${REPOSITORY}:base
 
 android: base
-	@$(RUNNER) build --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} -f ${CURDIR}/android/Dockerfile -t ${REPOSITORY}:${VERSION}-android .
+	@$(RUNNER) build --arch=amd64 --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} -f ${CURDIR}/android/Dockerfile -t ${REPOSITORY}:${VERSION}-android .
 	@$(RUNNER) tag ${REPOSITORY}:${VERSION}-android ${REPOSITORY}:android
 
 darwin: base

diff --git a/Makefile.multi b/Makefile.multi
@@ -39,52 +39,61 @@ docker-web: docker-base
 docker-all: docker-base docker-darwin docker-darwin-sdk-extractor docker-freebsd docker-linux docker-web
 
 podman-base:
-	@buildah manifest create ${REPOSITORY}:${VERSION}-base
-	@buildah bud --manifest ${REPOSITORY}:${VERSION}-base --arch amd64 base
-	@buildah bud --manifest ${REPOSITORY}:${VERSION}-base --arch arm64 base
+	@buildah manifest create ${VERSION}-base
+	@buildah bud --tag ${REPOSITORY}:${VERSION}-base --tag ${REPOSITORY}:${VERSION}-windows --manifest ${VERSION}-base --arch amd64 base
+	@buildah bud --tag ${REPOSITORY}:${VERSION}-base --tag ${REPOSITORY}:${VERSION}-windows --manifest ${VERSION}-base --arch arm64 base
+	@buildah manifest push --all ${VERSION}-base docker://${REPOSITORY}:${VERSION}-base
+	@buildah manifest push --all ${VERSION}-base docker://${REPOSITORY}:${VERSION}-windows
 
 podman-linux: podman-base
-	@buildah manifest create ${REPOSITORY}:${VERSION}-linux
-	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --manifest ${REPOSITORY}:${VERSION}-linux --arch amd64 linux
-	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --manifest ${REPOSITORY}:${VERSION}-linux --arch arm64 linux
+	@buildah manifest create ${VERSION}-linux
+	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --tag ${REPOSITORY}:${VERSION}-linux --manifest ${VERSION}-linux --arch amd64 linux
+	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --tag ${REPOSITORY}:${VERSION}-linux --manifest ${VERSION}-linux --arch arm64 linux
+	@buildah manifest push --all ${VERSION}-linux docker://${REPOSITORY}:${VERSION}-linux
 
 #podman-android: podman-base
-#	@buildah manifest create ${REPOSITORY}:${VERSION}-android
+#	@buildah manifest create ${VERSION}-android
 #	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --manifest ${REPOSITORY}:${VERSION}-android --arch amd64 android
 
 
 podman-darwin: podman-base
-	@buildah manifest create ${REPOSITORY}:${VERSION}-darwin
-	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --manifest ${REPOSITORY}:${VERSION}-darwin --arch amd64 darwin
-	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --manifest ${REPOSITORY}:${VERSION}-darwin --arch arm64 darwin
+	@buildah manifest create ${VERSION}-darwin
+	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --tag ${REPOSITORY}:${VERSION}-darwin --manifest ${VERSION}-darwin --arch amd64 darwin
+	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --tag ${REPOSITORY}:${VERSION}-darwin --manifest ${VERSION}-darwin --arch arm64 darwin
+	@buildah manifest push --all ${VERSION}-darwin docker://${REPOSITORY}:${VERSION}-darwin
 
 podman-darwin-sdk-extractor: podman-base
-	@buildah manifest create ${REPOSITORY}:${VERSION}-darwin-sdk-extractor
-	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --manifest ${REPOSITORY}:${VERSION}-darwin-sdk-extractor --arch amd64 darwin-sdk-extractor
-	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --manifest ${REPOSITORY}:${VERSION}-darwin-sdk-extractor --arch arm64 darwin-sdk-extractor
+	@buildah manifest create ${VERSION}-darwin-sdk-extractor
+	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --tag ${VERSION}-darwin-sdk-extractor --manifest ${REPOSITORY}:${VERSION}-darwin-sdk-extractor --arch amd64 darwin-sdk-extractor
+	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --tag ${VERSION}-darwin-sdk-extractor --manifest ${REPOSITORY}:${VERSION}-darwin-sdk-extractor --arch arm64 darwin-sdk-extractor
+	@buildah manifest push --all ${VERSION}-darwin-sdk-extractor docker://${REPOSITORY}:${VERSION}-darwin-sdk-extractor
 
 podman-freebsd-base: podman-base
-	@buildah manifest create ${REPOSITORY}:${VERSION}-freebsd-base
-	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --manifest ${REPOSITORY}:${VERSION}-freebsd-base --arch amd64 freebsd/base
-	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --manifest ${REPOSITORY}:${VERSION}-freebsd-base --arch arm64 freebsd/base
+	@buildah manifest create ${VERSION}-freebsd-base
+	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --tag ${REPOSITORY}:${VERSION}-freebsd-base --manifest ${VERSION}-freebsd-base --arch amd64 freebsd/base
+	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --tag ${REPOSITORY}:${VERSION}-freebsd-base --manifest ${VERSION}-freebsd-base --arch arm64 freebsd/base
+	@buildah manifest push --all ${VERSION}-freebsd-base docker://${REPOSITORY}:${VERSION}-freebsd-base
 
 podman-freebsd-amd64: podman-freebsd-base
-	@buildah manifest create ${REPOSITORY}:${VERSION}-freebsd-amd64
-	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --manifest ${REPOSITORY}:${VERSION}-freebsd-amd64 --arch amd64 freebsd/amd64
-	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --manifest ${REPOSITORY}:${VERSION}-freebsd-amd64 --arch arm64 freebsd/amd64
+	@buildah manifest create ${VERSION}-freebsd-amd64
+	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --tag ${REPOSITORY}:${VERSION}-freebsd-amd64 --manifest ${VERSION}-freebsd-amd64 --arch amd64 freebsd/amd64
+	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --tag ${REPOSITORY}:${VERSION}-freebsd-amd64 --manifest ${VERSION}-freebsd-amd64 --arch arm64 freebsd/amd64
+	@buildah manifest push --all ${VERSION}-freebsd-amd64 docker://${REPOSITORY}:${VERSION}-freebsd-amd64
 
 podman-freebsd-arm64: podman-freebsd-base
-        @buildah manifest create ${REPOSITORY}:${VERSION}-freebsd-arm64
-        @buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --manifest ${REPOSITORY}:${VERSION}-freebsd-arm64 --arch amd64 freebsd/arm64
-        @buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --manifest ${REPOSITORY}:${VERSION}-freebsd-arm64 --arch arm64 freebsd/arm64
+	@buildah manifest create ${VERSION}-freebsd-arm64
+	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --tag ${REPOSITORY}:${VERSION}-freebsd-arm64 --manifest ${VERSION}-freebsd-arm64 --arch amd64 freebsd/arm64
+	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --tag ${REPOSITORY}:${VERSION}-freebsd-arm64 --manifest ${VERSION}-freebsd-arm64 --arch arm64 freebsd/arm64
+	@buildah manifest push --all ${VERSION}-freebsd-arm64 docker://${REPOSITORY}:${VERSION}-freebsd-arm64
 
 podman-freebsd: podman-freebsd-arm64 podman-freebsd-amd64
 
 podman-web: podman-base
-	@buildah manifest create ${REPOSITORY}:${VERSION}-web
-	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --manifest ${REPOSITORY}:${VERSION}-web --arch amd64 web
-	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --manifest ${REPOSITORY}:${VERSION}-web --arch arm64 web
+	@buildah manifest create ${VERSION}-web
+	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --tag ${REPOSITORY}:${VERSION}-web --manifest ${VERSION}-web --arch amd64 web
+	@buildah bud --build-arg FYNE_CROSS_IMAGES_VERSION=${VERSION} --tag ${REPOSITORY}:${VERSION}-web --manifest ${VERSION}-web --arch arm64 web
+	@buildah manifest push --all ${VERSION}-web docker://${REPOSITORY}:${VERSION}-web
 
-podman-all: podman-base podman-darwin podman-darwin-sdk-extractor podman-freebsd podman-linux podman-web
+podman-all: podman-darwin podman-darwin-sdk-extractor podman-freebsd podman-linux podman-web
 
 all: $(RUNNER)-all