From 632523740c151797a69f04c5122eb3c5127573e4 Mon Sep 17 00:00:00 2001
From: Dmitry Stoletov <irvis@imega.ru>
Date: Sat, 4 Sep 2021 12:40:14 +0300
Subject: [PATCH 01/20] add config

Signed-off-by: Dmitry Stoletov <irvis@imega.ru>
---
 .github/workflows/release.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..3574d19
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,18 @@
+name: Release
+
+on: push
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Run on architecture ppc64le
+        uses: uraimo/run-on-arch-action@v2.1.1
+        with:
+          arch: ppc64le
+          distro: alpine_latest
+          githubToken: ${{ secrets.GITHUB_TOKEN }}
+          run: make test

From e6a43f4e07524a9071a7cceacf189519668fcc0a Mon Sep 17 00:00:00 2001
From: Dmitry Stoletov <irvis@imega.ru>
Date: Sat, 4 Sep 2021 12:44:43 +0300
Subject: [PATCH 02/20] add alpine-sdk

Signed-off-by: Dmitry Stoletov <irvis@imega.ru>
---
 .github/workflows/release.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3574d19..15d05c3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,4 +15,6 @@ jobs:
           arch: ppc64le
           distro: alpine_latest
           githubToken: ${{ secrets.GITHUB_TOKEN }}
-          run: make test
+          run: |
+            apk add --upd alpine-sdk
+            make test

From 55d62c79b7936bb7994b0716d7c45a394719efb1 Mon Sep 17 00:00:00 2001
From: Dmitry Stoletov <irvis@imega.ru>
Date: Sat, 4 Sep 2021 12:47:28 +0300
Subject: [PATCH 03/20] add docker

Signed-off-by: Dmitry Stoletov <irvis@imega.ru>
---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 15d05c3..89254c1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,5 +16,5 @@ jobs:
           distro: alpine_latest
           githubToken: ${{ secrets.GITHUB_TOKEN }}
           run: |
-            apk add --upd alpine-sdk
+            apk add --upd alpine-sdk docker
             make test

From 186dc79e58e2ea984f1c56576db017b6f4a9f619 Mon Sep 17 00:00:00 2001
From: Dmitry Stoletov <irvis@imega.ru>
Date: Sat, 4 Sep 2021 15:04:39 +0300
Subject: [PATCH 04/20] add other arch

Signed-off-by: Dmitry Stoletov <irvis@imega.ru>
---
 .github/workflows/release.yml | 20 ++++++++++++++++++++
 Makefile                      |  5 +++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 89254c1..0cd0c8f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,3 +18,23 @@ jobs:
           run: |
             apk add --upd alpine-sdk docker
             make test
+
+      - name: Run on architecture arm64
+        uses: uraimo/run-on-arch-action@v2.1.1
+        with:
+          arch: arm64
+          distro: alpine_latest
+          githubToken: ${{ secrets.GITHUB_TOKEN }}
+          run: |
+            apk add --upd alpine-sdk docker
+            make test
+
+      - name: Run on architecture amd64
+        uses: uraimo/run-on-arch-action@v2.1.1
+        with:
+          arch: amd64
+          distro: alpine_latest
+          githubToken: ${{ secrets.GITHUB_TOKEN }}
+          run: |
+            apk add --upd alpine-sdk docker
+            make test
diff --git a/Makefile b/Makefile
index fca2921..a88f629 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
+TAG=1.9.7
+ALPINE_VERSION=3.13
+
 IMAGE=imega/base-builder
-TAG=latest
-ALPINE_VERSION=3.11
 ARCH=$(shell uname -m)
 
 ifeq ($(ARCH),aarch64)

From 90118894e7440d1270ef514d495b113f39a28895 Mon Sep 17 00:00:00 2001
From: Dmitry Stoletov <irvis@imega.ru>
Date: Sat, 4 Sep 2021 15:08:11 +0300
Subject: [PATCH 05/20] add other arch

Signed-off-by: Dmitry Stoletov <irvis@imega.ru>
---
 .github/workflows/release.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0cd0c8f..827ebf2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,10 +19,10 @@ jobs:
             apk add --upd alpine-sdk docker
             make test
 
-      - name: Run on architecture arm64
+      - name: Run on architecture armv7
         uses: uraimo/run-on-arch-action@v2.1.1
         with:
-          arch: arm64
+          arch: armv7
           distro: alpine_latest
           githubToken: ${{ secrets.GITHUB_TOKEN }}
           run: |
@@ -32,7 +32,7 @@ jobs:
       - name: Run on architecture amd64
         uses: uraimo/run-on-arch-action@v2.1.1
         with:
-          arch: amd64
+          arch: aarch64
           distro: alpine_latest
           githubToken: ${{ secrets.GITHUB_TOKEN }}
           run: |

From 5e8d1c1bad5579da79e8acec97e28a899142ee8e Mon Sep 17 00:00:00 2001
From: Dmitry Stoletov <irvis@imega.ru>
Date: Sat, 4 Sep 2021 15:42:37 +0300
Subject: [PATCH 06/20] add other arch

Signed-off-by: Dmitry Stoletov <irvis@imega.ru>
---
 .github/workflows/release.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 827ebf2..4cf93f4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,7 +29,7 @@ jobs:
             apk add --upd alpine-sdk docker
             make test
 
-      - name: Run on architecture amd64
+      - name: Run on architecture aarch64
         uses: uraimo/run-on-arch-action@v2.1.1
         with:
           arch: aarch64
@@ -38,3 +38,8 @@ jobs:
           run: |
             apk add --upd alpine-sdk docker
             make test
+
+      - name: Run on architecture amd64
+        run: |
+          apk add --upd alpine-sdk docker
+          make test

From 32aea7e2e5c967980b2857d5f5a5b7e65987a40d Mon Sep 17 00:00:00 2001
From: Dmitry Stoletov <irvis@imega.ru>
Date: Sat, 4 Sep 2021 16:02:10 +0300
Subject: [PATCH 07/20] add other arch

Signed-off-by: Dmitry Stoletov <irvis@imega.ru>
---
 .github/workflows/release.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4cf93f4..858345e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -40,6 +40,4 @@ jobs:
             make test
 
       - name: Run on architecture amd64
-        run: |
-          apk add --upd alpine-sdk docker
-          make test
+        run: make test

From 258d85e85c6d277f05c218050e84f2ef51e74a04 Mon Sep 17 00:00:00 2001
From: Dmitry Stoletov <irvis@imega.ru>
Date: Sun, 5 Sep 2021 11:53:10 +0300
Subject: [PATCH 08/20] test env

Signed-off-by: Dmitry Stoletov <irvis@imega.ru>
---
 .github/workflows/release.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 858345e..84e5ae6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,6 +25,9 @@ jobs:
           arch: armv7
           distro: alpine_latest
           githubToken: ${{ secrets.GITHUB_TOKEN }}
+          env: |
+            GOARCH="amd64"
+            GOOS="linux"
           run: |
             apk add --upd alpine-sdk docker
             make test

From 1a26e273983f1819d4169565950c63d72f7e06df Mon Sep 17 00:00:00 2001
From: Dmitry Stoletov <irvis@imega.ru>
Date: Sun, 5 Sep 2021 11:57:06 +0300
Subject: [PATCH 09/20] test env

Signed-off-by: Dmitry Stoletov <irvis@imega.ru>
---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 84e5ae6..4a56b96 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,8 +26,8 @@ jobs:
           distro: alpine_latest
           githubToken: ${{ secrets.GITHUB_TOKEN }}
           env: |
-            GOARCH="amd64"
-            GOOS="linux"
+            GOARCH: amd64
+            GOOS: linux
           run: |
             apk add --upd alpine-sdk docker
             make test

From 28b4fdfb07e6a16f325b11d831208f353ecb302f Mon Sep 17 00:00:00 2001
From: Dmitry Stoletov <irvis@imega.ru>
Date: Wed, 10 Nov 2021 10:30:19 +0300
Subject: [PATCH 10/20] add inspect

Signed-off-by: Dmitry Stoletov <irvis@imega.ru>
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index a88f629..272b96a 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ build:
 	@docker build --build-arg VERSION=$(TAG) \
 		--build-arg ALPINE_VERSION=$(ALPINE_VERSION) \
 		-t $(IMAGE):$(TAG)-$(ARCH) .
+	@docker inspect $(IMAGE):$(TAG)-$(ARCH)
 
 login:
 	@docker login --username $(DOCKER_USER) --password $(DOCKER_PASS)

From 48446fd1b17718414d9f36beb111de2f03f28b57 Mon Sep 17 00:00:00 2001
From: Dmitry Stoletov <irvis@imega.ru>
Date: Wed, 10 Nov 2021 10:37:38 +0300
Subject: [PATCH 11/20] add inspect

Signed-off-by: Dmitry Stoletov <irvis@imega.ru>
---
 .github/workflows/release.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4a56b96..28deb4f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,6 +16,7 @@ jobs:
           distro: alpine_latest
           githubToken: ${{ secrets.GITHUB_TOKEN }}
           run: |
+            uname -a
             apk add --upd alpine-sdk docker
             make test
 
@@ -29,6 +30,7 @@ jobs:
             GOARCH: amd64
             GOOS: linux
           run: |
+            uname -a
             apk add --upd alpine-sdk docker
             make test
 
@@ -39,6 +41,7 @@ jobs:
           distro: alpine_latest
           githubToken: ${{ secrets.GITHUB_TOKEN }}
           run: |
+            uname -a
             apk add --upd alpine-sdk docker
             make test
 

From 1eed8486ee4c474906f997b5ad104950a9365005 Mon Sep 17 00:00:00 2001
From: Dmitry Stoletov <irvis@imega.ru>
Date: Wed, 10 Nov 2021 12:12:08 +0300
Subject: [PATCH 12/20] remove travis;

Signed-off-by: Dmitry Stoletov <irvis@imega.ru>
---
 .circleci/config.yml          | 19 ------------
 .github/workflows/release.yml | 20 ++++++------
 .travis.yml                   | 57 -----------------------------------
 Makefile                      | 18 +++++++----
 4 files changed, 22 insertions(+), 92 deletions(-)
 delete mode 100644 .circleci/config.yml
 delete mode 100644 .travis.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index dd9bf3c..0000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: 2
-
-jobs:
-  tests:
-    machine:
-      enabled: true
-    steps:
-      - checkout
-      - run: |
-          make test || exit 1
-
-workflows:
-  version: 2
-  test_and_release:
-    jobs:
-      - tests:
-          filters:
-            tags:
-              only: /.*/
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 28deb4f..4762d04 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,9 +16,7 @@ jobs:
           distro: alpine_latest
           githubToken: ${{ secrets.GITHUB_TOKEN }}
           run: |
-            uname -a
-            apk add --upd alpine-sdk docker
-            make test
+            make release
 
       - name: Run on architecture armv7
         uses: uraimo/run-on-arch-action@v2.1.1
@@ -30,9 +28,7 @@ jobs:
             GOARCH: amd64
             GOOS: linux
           run: |
-            uname -a
-            apk add --upd alpine-sdk docker
-            make test
+            make release
 
       - name: Run on architecture aarch64
         uses: uraimo/run-on-arch-action@v2.1.1
@@ -41,9 +37,13 @@ jobs:
           distro: alpine_latest
           githubToken: ${{ secrets.GITHUB_TOKEN }}
           run: |
-            uname -a
-            apk add --upd alpine-sdk docker
-            make test
+            make release
 
       - name: Run on architecture amd64
-        run: make test
+        run: |
+          make release
+          make test
+
+      - name: Manifest
+        run: |
+          make release-manifest
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 0717ac3..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-language: ruby
-services:
-  - docker
-env:
-  global:
-    - VERSION=1.9.6
-    - IMAGE=imega/base-builder
-    - ALPINE_VERSION=3.13
-
-stages:
-  - Test
-  - Arch-Release
-  - Manifest-Release
-
-jobs:
-  include:
-    - stage: Test
-      arch: amd64
-      os: linux
-      script: make test
-    - stage: Test
-      arch: ppc64le
-      os: linux
-      script: make test
-    - stage: Test
-      arch: arm64
-      os: linux
-      script: make test
-
-    - stage: Arch-Release
-      if: branch = master
-      os: linux
-      arch: amd64
-      script:
-        - ARCH_RELEASE=0
-        - docker pull $IMAGE:$VERSION-$TRAVIS_CPU_ARCH || ARCH_RELEASE=1
-        - "[ ${ARCH_RELEASE} == 1 ] && (make release DOCKER_USER=$DOCKER_USER DOCKER_PASS=$DOCKER_PASS IMAGE=$IMAGE TAG=$VERSION)"
-    - stage: Arch-Release
-      if: branch = master
-      os: linux
-      arch: ppc64le
-      script:
-        - "docker pull $IMAGE:$VERSION-$TRAVIS_CPU_ARCH || make release DOCKER_USER=$DOCKER_USER DOCKER_PASS=$DOCKER_PASS IMAGE=$IMAGE TAG=$VERSION"
-    - stage: Arch-Release
-      if: branch = master
-      os: linux
-      arch: arm64
-      script:
-        - "docker pull $IMAGE:$VERSION-$TRAVIS_CPU_ARCH || make release DOCKER_USER=$DOCKER_USER DOCKER_PASS=$DOCKER_PASS IMAGE=$IMAGE TAG=$VERSION"
-
-    - stage: Manifest-Release
-      if: branch = master
-      arch: amd64
-      os: linux
-      script:
-        - export DOCKER_CLI_EXPERIMENTAL=enabled
-        - "docker pull $IMAGE:$VERSION || make release-manifest DOCKER_USER=$DOCKER_USER DOCKER_PASS=$DOCKER_PASS IMAGE=$IMAGE TAG=$VERSION || exit 0"
diff --git a/Makefile b/Makefile
index 272b96a..5d9a6cc 100644
--- a/Makefile
+++ b/Makefile
@@ -23,14 +23,20 @@ login:
 
 release: login build
 	@docker tag $(IMAGE):$(TAG)-$(ARCH) $(IMAGE):latest-$(ARCH)
-	@docker push $(IMAGE):$(TAG)-$(ARCH)
-	@docker push $(IMAGE):latest-$(ARCH)
+#@docker push $(IMAGE):$(TAG)-$(ARCH)
+#@docker push $(IMAGE):latest-$(ARCH)
 
 release-manifest: login
-	docker manifest create $(IMAGE):$(TAG) $(IMAGE):$(TAG)-amd64 $(IMAGE):$(TAG)-ppc64le $(IMAGE):$(TAG)-arm64
-	docker manifest create $(IMAGE):latest $(IMAGE):latest-amd64 $(IMAGE):latest-ppc64le $(IMAGE):latest-arm64
-	docker manifest push $(IMAGE):$(TAG)
-	docker manifest push $(IMAGE):latest
+	docker manifest create $(IMAGE):$(TAG) \
+		$(IMAGE):$(TAG)-amd64 \
+		$(IMAGE):$(TAG)-ppc64le \
+		$(IMAGE):$(TAG)-arm64
+	docker manifest create $(IMAGE):latest \
+		$(IMAGE):latest-amd64 \
+		$(IMAGE):latest-ppc64le \
+		$(IMAGE):latest-arm64
+#docker manifest push $(IMAGE):$(TAG)
+#docker manifest push $(IMAGE):latest
 
 test: build
 	$(MAKE) test -C tests IMAGE=$(IMAGE) TAG=$(TAG)

From 7de0ba484aa055f42d1420667d7bfdc81285295e Mon Sep 17 00:00:00 2001
From: Dmitry Stoletov <irvis@imega.ru>
Date: Wed, 10 Nov 2021 12:18:23 +0300
Subject: [PATCH 13/20] remove travis;

Signed-off-by: Dmitry Stoletov <irvis@imega.ru>
---
 .github/workflows/release.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4762d04..a917e79 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,6 +16,7 @@ jobs:
           distro: alpine_latest
           githubToken: ${{ secrets.GITHUB_TOKEN }}
           run: |
+            apk add --upd alpine-sdk docker
             make release
 
       - name: Run on architecture armv7
@@ -28,6 +29,7 @@ jobs:
             GOARCH: amd64
             GOOS: linux
           run: |
+            apk add --upd alpine-sdk docker
             make release
 
       - name: Run on architecture aarch64
@@ -37,6 +39,7 @@ jobs:
           distro: alpine_latest
           githubToken: ${{ secrets.GITHUB_TOKEN }}
           run: |
+            apk add --upd alpine-sdk docker
             make release
 
       - name: Run on architecture amd64

From 88c07ff74b6c862d18dd18cb99fa7c0bf4c67864 Mon Sep 17 00:00:00 2001
From: Dmitry Stoletov <irvis@imega.ru>
Date: Wed, 10 Nov 2021 12:28:11 +0300
Subject: [PATCH 14/20] add envs

Signed-off-by: Dmitry Stoletov <irvis@imega.ru>
---
 .github/workflows/release.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a917e79..99836e4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,6 +15,9 @@ jobs:
           arch: ppc64le
           distro: alpine_latest
           githubToken: ${{ secrets.GITHUB_TOKEN }}
+          env:
+            DOCKER_USER: ${{ secrets.DOCKER_USER }}
+            DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
           run: |
             apk add --upd alpine-sdk docker
             make release

From cad6206d9adab0e3fcdbb2fd794eadaaf68b07a6 Mon Sep 17 00:00:00 2001
From: Dmitry Stoletov <irvis@imega.ru>
Date: Wed, 10 Nov 2021 12:33:01 +0300
Subject: [PATCH 15/20] add envs

Signed-off-by: Dmitry Stoletov <irvis@imega.ru>
---
 .github/workflows/release.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 99836e4..f2e7d29 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,13 +11,13 @@ jobs:
 
       - name: Run on architecture ppc64le
         uses: uraimo/run-on-arch-action@v2.1.1
+        env:
+          DOCKER_USER: ${{ secrets.DOCKER_USER }}
+          DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
         with:
           arch: ppc64le
           distro: alpine_latest
           githubToken: ${{ secrets.GITHUB_TOKEN }}
-          env:
-            DOCKER_USER: ${{ secrets.DOCKER_USER }}
-            DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
           run: |
             apk add --upd alpine-sdk docker
             make release

From 80713eb64ed963aaf0c0ef16ced8cd9d36c5d432 Mon Sep 17 00:00:00 2001
From: Dmitry Stoletov <irvis@imega.ru>
Date: Wed, 10 Nov 2021 12:42:25 +0300
Subject: [PATCH 16/20] add envs 2

Signed-off-by: Dmitry Stoletov <irvis@imega.ru>
---
 .github/workflows/release.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f2e7d29..1b79357 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,12 +11,12 @@ jobs:
 
       - name: Run on architecture ppc64le
         uses: uraimo/run-on-arch-action@v2.1.1
-        env:
-          DOCKER_USER: ${{ secrets.DOCKER_USER }}
-          DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
         with:
           arch: ppc64le
           distro: alpine_latest
+          env:
+            DOCKER_USER: ${{ secrets.DOCKER_USER }}
+            DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
           githubToken: ${{ secrets.GITHUB_TOKEN }}
           run: |
             apk add --upd alpine-sdk docker

From b81f75fd8aa16082d41dc3c0a89e3452c5426889 Mon Sep 17 00:00:00 2001
From: Dmitry Stoletov <irvis@imega.ru>
Date: Wed, 10 Nov 2021 12:43:18 +0300
Subject: [PATCH 17/20] add envs 3

Signed-off-by: Dmitry Stoletov <irvis@imega.ru>
---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1b79357..a5b2ef8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
         with:
           arch: ppc64le
           distro: alpine_latest
-          env:
+          env: |
             DOCKER_USER: ${{ secrets.DOCKER_USER }}
             DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
           githubToken: ${{ secrets.GITHUB_TOKEN }}

From 779e6509fb757ba0800d178eb0fd1d36153ec287 Mon Sep 17 00:00:00 2001
From: Dmitry Stoletov <irvis@imega.ru>
Date: Wed, 10 Nov 2021 13:18:31 +0300
Subject: [PATCH 18/20] add envs 4

Signed-off-by: Dmitry Stoletov <irvis@imega.ru>
---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5d9a6cc..55053b3 100644
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,9 @@ ifeq ($(ARCH),x86_64)
 endif
 
 build:
-	@docker build --build-arg VERSION=$(TAG) \
+	docker build --build-arg VERSION=$(TAG) \
 		--build-arg ALPINE_VERSION=$(ALPINE_VERSION) \
+		--platform $(ARCH) \
 		-t $(IMAGE):$(TAG)-$(ARCH) .
 	@docker inspect $(IMAGE):$(TAG)-$(ARCH)
 

From 83b5a26aeefa78417063ceadfd3fffe36886d868 Mon Sep 17 00:00:00 2001
From: Dmitry Stoletov <irvis@imega.ru>
Date: Wed, 16 Mar 2022 17:48:45 +0300
Subject: [PATCH 19/20] up

Signed-off-by: Dmitry Stoletov <irvis@imega.ru>
---
 Makefile | 2 +-
 build.sh | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 55053b3..f8d10fb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 TAG=1.9.7
-ALPINE_VERSION=3.13
+ALPINE_VERSION=3.15
 
 IMAGE=imega/base-builder
 ARCH=$(shell uname -m)
diff --git a/build.sh b/build.sh
index 0aa71df..c1af5f5 100755
--- a/build.sh
+++ b/build.sh
@@ -21,8 +21,8 @@ esac
 done
 
 cat << 'EOF' > /etc/apk/repositories
-http://dl-cdn.alpinelinux.org/alpine/v3.13/main
-http://dl-cdn.alpinelinux.org/alpine/v3.13/community
+http://dl-cdn.alpinelinux.org/alpine/v3.15/main
+http://dl-cdn.alpinelinux.org/alpine/v3.15/community
 @testing      http://dl-cdn.alpinelinux.org/alpine/edge/testing
 @main         http://dl-cdn.alpinelinux.org/alpine/edge/main
 @community    http://dl-cdn.alpinelinux.org/alpine/edge/community
@@ -57,6 +57,10 @@ http://dl-cdn.alpinelinux.org/alpine/v3.13/community
 @v312community http://dl-cdn.alpinelinux.org/alpine/v3.12/community
 @v313          http://dl-cdn.alpinelinux.org/alpine/v3.13/main
 @v313community http://dl-cdn.alpinelinux.org/alpine/v3.13/community
+@v314          http://dl-cdn.alpinelinux.org/alpine/v3.13/main
+@v314community http://dl-cdn.alpinelinux.org/alpine/v3.13/community
+@v315          http://dl-cdn.alpinelinux.org/alpine/v3.15/main
+@v315community http://dl-cdn.alpinelinux.org/alpine/v3.15/community
 EOF
 
 apk --repositories-file /etc/apk/repositories --update --allow-untrusted --initdb --no-cache --root $ROOTFS add $PACKAGES

From 6bccfcc37ac07c9aa91a59eaced668262273e0a2 Mon Sep 17 00:00:00 2001
From: Dmitry Stoletov <irvis@imega.ru>
Date: Wed, 16 Mar 2022 17:54:52 +0300
Subject: [PATCH 20/20] up

Signed-off-by: Dmitry Stoletov <irvis@imega.ru>
---
 .github/workflows/release.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a5b2ef8..7753844 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,18 +22,18 @@ jobs:
             apk add --upd alpine-sdk docker
             make release
 
-      - name: Run on architecture armv7
-        uses: uraimo/run-on-arch-action@v2.1.1
-        with:
-          arch: armv7
-          distro: alpine_latest
-          githubToken: ${{ secrets.GITHUB_TOKEN }}
-          env: |
-            GOARCH: amd64
-            GOOS: linux
-          run: |
-            apk add --upd alpine-sdk docker
-            make release
+      # - name: Run on architecture armv7
+      #   uses: uraimo/run-on-arch-action@v2.1.1
+      #   with:
+      #     arch: armv7
+      #     distro: alpine_latest
+      #     githubToken: ${{ secrets.GITHUB_TOKEN }}
+      #     env: |
+      #       GOARCH: amd64
+      #       GOOS: linux
+      #     run: |
+      #       apk add --upd alpine-sdk docker
+      #       make release
 
       - name: Run on architecture aarch64
         uses: uraimo/run-on-arch-action@v2.1.1