From 108c87c24343f9c991a270e740c46720d44ac5ea Mon Sep 17 00:00:00 2001 From: Antoine GIRARD Date: Thu, 31 Oct 2019 23:05:14 +0100 Subject: [PATCH 1/8] Create buildx.sh --- gitea/buildx.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 gitea/buildx.sh diff --git a/gitea/buildx.sh b/gitea/buildx.sh new file mode 100644 index 0000000..50c54bc --- /dev/null +++ b/gitea/buildx.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +#Setup buildx +export DOCKER_BUILDKIT=1 +docker build --platform=local -o . git://github.com/docker/buildx +mv buildx ~/.docker/cli-plugins/docker-buildx + +#Setup gitea +git clone https://github.com/go-gitea/gitea --depth 10 +cd gitea + +#Building +docker buildx build . From 948ad69b79edb2e7e1297342bff87cf4a4bc83be Mon Sep 17 00:00:00 2001 From: Antoine GIRARD Date: Thu, 31 Oct 2019 23:06:25 +0100 Subject: [PATCH 2/8] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 60bbc2b..ea9dbbb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ before_script: script: - (cd gitea && ./build.sh) - (cd archlinux && ./build.sh) + - (cd gitea && rm -Rf gitea && ./buildx.sh) after_success: - $GOPATH/bin/manifest-tool --docker-cfg $HOME/.docker/ push from-spec gitea/gitea-multi.yml From f9884a47b61adadce72bf5897e51a3810a996350 Mon Sep 17 00:00:00 2001 From: Antoine GIRARD Date: Thu, 31 Oct 2019 23:21:01 +0100 Subject: [PATCH 3/8] Update .travis.yml --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ea9dbbb..7cc0cd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,12 +16,10 @@ before_script: - go get -u -v github.com/estesp/manifest-tool script: - - (cd gitea && ./build.sh) - (cd archlinux && ./build.sh) - - (cd gitea && rm -Rf gitea && ./buildx.sh) + - (cd gitea && ./buildx.sh) after_success: - - $GOPATH/bin/manifest-tool --docker-cfg $HOME/.docker/ push from-spec gitea/gitea-multi.yml - $GOPATH/bin/manifest-tool --docker-cfg $HOME/.docker/ push from-spec archlinux/archlinux-multi.yml - $GOPATH/bin/manifest-tool --docker-cfg $HOME/.docker/ push from-spec alpine-multi/alpine-multi.yml - $GOPATH/bin/manifest-tool --docker-cfg $HOME/.docker/ push from-spec alpine-multi/alpine-multi-edge.yml From 6fd326be8dd27dd7d871f269bf2d3b614c7cd28e Mon Sep 17 00:00:00 2001 From: Antoine GIRARD Date: Thu, 31 Oct 2019 23:22:18 +0100 Subject: [PATCH 4/8] Update buildx.sh --- gitea/buildx.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitea/buildx.sh b/gitea/buildx.sh index 50c54bc..33cd555 100644 --- a/gitea/buildx.sh +++ b/gitea/buildx.sh @@ -1,6 +1,7 @@ #!/bin/bash #Setup buildx +export DOCKER_CLI_EXPERIMENTAL=enabled export DOCKER_BUILDKIT=1 docker build --platform=local -o . git://github.com/docker/buildx mv buildx ~/.docker/cli-plugins/docker-buildx @@ -10,4 +11,4 @@ git clone https://github.com/go-gitea/gitea --depth 10 cd gitea #Building -docker buildx build . +docker buildx build --push --platform=linux/amd64,linux/arm64,linux/arm/v6 . From b8091a0eb1cfb5dac52e784220cfc1105329649c Mon Sep 17 00:00:00 2001 From: Antoine GIRARD Date: Thu, 31 Oct 2019 23:22:51 +0100 Subject: [PATCH 5/8] Delete build.sh --- gitea/build.sh | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100755 gitea/build.sh diff --git a/gitea/build.sh b/gitea/build.sh deleted file mode 100755 index cb01fe7..0000000 --- a/gitea/build.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -git clone https://github.com/go-gitea/gitea --depth 10 -cd gitea -git fetch origin pull/3958/head:docker-multiarch -git checkout docker-multiarch - -DOCKER_IMAGE=sapk/gitea TARGET=amd64 GOARCH=amd64 QEMU_ARCH=amd64 make docker-cross -DOCKER_IMAGE=sapk/gitea TARGET=arm64v8 GOARCH=arm64 QEMU_ARCH=aarch64 make docker-cross -DOCKER_IMAGE=sapk/gitea TARGET=arm32v6 GOARCH=arm QEMU_ARCH=arm make docker-cross - -docker push sapk/gitea:latest-linux-amd64 -docker push sapk/gitea:latest-linux-arm -docker push sapk/gitea:latest-linux-arm64 From 94d820452518a2021d7066634165cae75b1a4e95 Mon Sep 17 00:00:00 2001 From: Antoine GIRARD Date: Thu, 31 Oct 2019 23:25:34 +0100 Subject: [PATCH 6/8] Update buildx.sh --- gitea/buildx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitea/buildx.sh b/gitea/buildx.sh index 33cd555..a5194f4 100644 --- a/gitea/buildx.sh +++ b/gitea/buildx.sh @@ -11,4 +11,4 @@ git clone https://github.com/go-gitea/gitea --depth 10 cd gitea #Building -docker buildx build --push --platform=linux/amd64,linux/arm64,linux/arm/v6 . +docker buildx build -t sapk/gitea --push --platform=linux/amd64,linux/arm64,linux/arm/v6 . From 29bcb4f197b7d3f304d83d56faa3f5d2e042fa44 Mon Sep 17 00:00:00 2001 From: Antoine GIRARD Date: Thu, 31 Oct 2019 23:25:53 +0100 Subject: [PATCH 7/8] Delete gitea-multi.yml --- gitea/gitea-multi.yml | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 gitea/gitea-multi.yml diff --git a/gitea/gitea-multi.yml b/gitea/gitea-multi.yml deleted file mode 100644 index eda6421..0000000 --- a/gitea/gitea-multi.yml +++ /dev/null @@ -1,14 +0,0 @@ -image: sapk/gitea:latest -manifests: - - image: sapk/gitea:latest-linux-amd64 - platform: - architecture: amd64 - os: linux - - image: sapk/gitea:latest-linux-arm - platform: - architecture: arm - os: linux - - image: sapk/gitea:latest-linux-arm64 - platform: - architecture: arm64 - os: linux From 433d24afd00b3d094458345975359b2ebcc0b2fb Mon Sep 17 00:00:00 2001 From: Antoine GIRARD Date: Fri, 1 Nov 2019 00:02:47 +0100 Subject: [PATCH 8/8] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7cc0cd4..f562aec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ before_script: script: - (cd archlinux && ./build.sh) - - (cd gitea && ./buildx.sh) + - (cd gitea && chmod +x ./buildx.sh && ./buildx.sh) after_success: - $GOPATH/bin/manifest-tool --docker-cfg $HOME/.docker/ push from-spec archlinux/archlinux-multi.yml