From f50edc4e22d352affe54ef38ff0977f00c51d161 Mon Sep 17 00:00:00 2001
From: Kibo Hikari <enra@sayonika.moe>
Date: Mon, 22 Jul 2019 17:06:37 +0000
Subject: [PATCH 01/18] [armhf] define kernel headers properly

3.x was the only available headers in jessie

FIXME: update to buster
Signed-off-by: Kibo Hikari <enra@sayonika.moe>
---
 armhf.dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armhf.dockerfile b/armhf.dockerfile
index d2f51ec..ef581fb 100644
--- a/armhf.dockerfile
+++ b/armhf.dockerfile
@@ -2,6 +2,6 @@ FROM balenalib/armv7hf-debian-node:10.15-jessie-build
 
 RUN ["cross-build-start"]
 
-RUN apt-get update && apt-get -y install build-essential linux-headers-generic gcc g++ ccache git make
+RUN apt-get update && apt-get -y install build-essential linux-headers-3.16.0-9-all-armhf linux-headers-3.16.0-9-common gcc g++ ccache git make
 
 RUN ["cross-build-end"]

From 32e554888cc3107bb19578b02cb3a8d8ef90f522 Mon Sep 17 00:00:00 2001
From: Capuccino <enra@sayonika.moe>
Date: Tue, 23 Jul 2019 02:52:24 +0800
Subject: [PATCH 02/18] [aarch64] fix kernel packages

Signed-off-by: Capuccino <enra@sayonika.moe>
---
 aarch64.dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aarch64.dockerfile b/aarch64.dockerfile
index 6f53ee0..52ef3d9 100644
--- a/aarch64.dockerfile
+++ b/aarch64.dockerfile
@@ -2,6 +2,6 @@ FROM balenalib/aarch64-debian-node:10.15-jessie-build
 
 RUN ["cross-build-start"]
 
-RUN apt-get update && apt-get -y install build-essential linux-headers-generic gcc g++ ccache git make
+RUN apt-get update && apt-get -y install build-essential linux-headers-3.16.0-6-all-arm64 linux-headers-3.16.0-6-common gcc g++ ccache git make
 
 RUN ["cross-build-end"]

From 16d6b5c8d1bb27024aff19d582fade4eb32bf0a2 Mon Sep 17 00:00:00 2001
From: Capuccino <enra@sayonika.moe>
Date: Tue, 23 Jul 2019 10:40:59 +0800
Subject: [PATCH 03/18] [scripts] wrap cross-bild commands around exec

Signed-off-by: Capuccino <enra@sayonika.moe>
---
 scripts/docker_build.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/docker_build.sh b/scripts/docker_build.sh
index 6227c55..6d07978 100755
--- a/scripts/docker_build.sh
+++ b/scripts/docker_build.sh
@@ -18,15 +18,15 @@ function docker_build() {
 	 docker exec $containerID mkdir /src
 
 	 function exec() {
-	 	 docker exec $containerID bash -c "$@"
+         # HACK: cross-build-start and cross-build end is needed to be wrapped around commands.
+         # This is inevitably the only way to perform cross-targeting in-Docker.
+	 	 docker exec $containerID bash -c "cross-build-start; $@; cross-build-end"
 	 }
 
 	 docker cp ../. $containerID:/src
-	 exec "cross-build-start"
 	 exec "$PREBUILD_COMMAND/src/lib/node/build.sh"
 	 exec "cd /src && npm rebuild"
 	 exec "cd /src && npm test"
-	 exec "cross-build-end"
 	 docker cp $containerID:/src/lib/node/out/Release/node ../build/$PACKAGE_VERSION/$BINARY_NAME
 	 ;;
 	*)

From 1fa07d95eaf71e5be033668255eaf6d66a3baa0b Mon Sep 17 00:00:00 2001
From: Kibo Hikari <enra@sayonika.moe>
Date: Fri, 2 Aug 2019 18:33:22 +0800
Subject: [PATCH 04/18] style: convert indents to tabs

Signed-off-by: Kibo Hikari <enra@sayonika.moe>
---
 scripts/docker_build.sh | 54 ++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/scripts/docker_build.sh b/scripts/docker_build.sh
index 6d07978..06c51b2 100755
--- a/scripts/docker_build.sh
+++ b/scripts/docker_build.sh
@@ -13,38 +13,38 @@ source ./vars.sh
 function docker_build() {
 	case "$IMAGE" in
 	*armv7hf* | armv7hf | aarch64 | *aarch64*)
-	 containerID=$(docker create -it -v $HOME/$CACHE_DIR:/ccache $IMAGE)
-	 docker start $containerID
-	 docker exec $containerID mkdir /src
+	containerID=$(docker create -it -v $HOME/$CACHE_DIR:/ccache $IMAGE)
+	docker start $containerID
+	docker exec $containerID mkdir /src
 
-	 function exec() {
-         # HACK: cross-build-start and cross-build end is needed to be wrapped around commands.
-         # This is inevitably the only way to perform cross-targeting in-Docker.
-	 	 docker exec $containerID bash -c "cross-build-start; $@; cross-build-end"
-	 }
+	function exec() {
+		# HACK: cross-build-start and cross-build end is needed to be wrapped around commands.
+		# This is inevitably the only way to perform cross-targeting in-Docker.
+		docker exec $containerID bash -c "cross-build-start; $@; cross-build-end"
+	}
 
-	 docker cp ../. $containerID:/src
-	 exec "$PREBUILD_COMMAND/src/lib/node/build.sh"
-	 exec "cd /src && npm rebuild"
-	 exec "cd /src && npm test"
-	 docker cp $containerID:/src/lib/node/out/Release/node ../build/$PACKAGE_VERSION/$BINARY_NAME
-	 ;;
+		docker cp ../. $containerID:/src
+		exec "$PREBUILD_COMMAND/src/lib/node/build.sh"
+		exec "cd /src && npm rebuild"
+		exec "cd /src && npm test"
+		docker cp $containerID:/src/lib/node/out/Release/node ../build/$PACKAGE_VERSION/$BINARY_NAME
+		;;
 	*)
-	 containerID=$(docker create -it -v $HOME/$CACHE_DIR:/ccache $IMAGE)
-	 docker start $containerID
-	 docker exec $containerID mkdir /src
+	containerID=$(docker create -it -v $HOME/$CACHE_DIR:/ccache $IMAGE)
+	docker start $containerID
+	docker exec $containerID mkdir /src
 
-	 function exec() {
-	 	 docker exec $containerID bash -c "$@"
-	 }
+	function exec() {
+		docker exec $containerID bash -c "$@"
+	}
 
-	 docker cp ../. $containerID:/src
-	 exec "$PREBUILD_COMMAND/src/lib/node/build.sh"
-	 exec "cd /src && npm rebuild"
-	 exec "cd /src && npm test"
-	 docker cp $containerID:/src/lib/node/out/Release/node ../build/$PACKAGE_VERSION/$BINARY_NAME
-	;;
-    esac
+		docker cp ../. $containerID:/src
+		exec "$PREBUILD_COMMAND/src/lib/node/build.sh"
+		exec "cd /src && npm rebuild"
+		exec "cd /src && npm test"
+		docker cp $containerID:/src/lib/node/out/Release/node ../build/$PACKAGE_VERSION/$BINARY_NAME
+		;;
+	esac
 }
 
 if [[ "$TARGET" == "alpine" ]]; then

From bc6a911c337beefd52bd953b3835e4dfac97ef9b Mon Sep 17 00:00:00 2001
From: Ayane Satomi <sr229@coder.com>
Date: Mon, 30 Sep 2019 19:51:39 +0800
Subject: [PATCH 05/18] nbin: use docker buildx and qemu to build nbin

Signed-off-by: Ayane Satomi <sr229@coder.com>
---
 .github/workflows/build-commit-docker.yml | 57 +++++++++++++++++++++++
 .github/workflows/build-commit.yml        | 39 ++++++++++++++++
 aarch64-alpine.dockerfile                 |  7 ---
 aarch64.dockerfile                        |  7 ---
 armhf-alpine.dockerfile                   |  7 ---
 armhf.dockerfile                          |  7 ---
 scripts/docker_build.sh                   | 10 ++--
 7 files changed, 101 insertions(+), 33 deletions(-)
 create mode 100644 .github/workflows/build-commit-docker.yml
 create mode 100644 .github/workflows/build-commit.yml
 delete mode 100644 aarch64-alpine.dockerfile
 delete mode 100644 aarch64.dockerfile
 delete mode 100644 armhf-alpine.dockerfile
 delete mode 100644 armhf.dockerfile

diff --git a/.github/workflows/build-commit-docker.yml b/.github/workflows/build-commit-docker.yml
new file mode 100644
index 0000000..31893dd
--- /dev/null
+++ b/.github/workflows/build-commit-docker.yml
@@ -0,0 +1,57 @@
+name: Build Docker images
+on:
+  push:
+    branches:
+       - 'sr229/docker-xbuild'
+       - 'master'
+
+jobs:
+  build_arm:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Install Docker Edge Build (for Xbuild commands)
+        command: wget -qO - https://test.docker.com | sh
+      
+      - name: Setup Builder instance
+        command: |
+            docker buildx create --name cdr-build
+            docker buildx use cdr-build
+            docker buildx inspect --bootstrap
+      
+      - name: Build Images - ARM (CentOS)
+        command: |
+           docker buildx build --platform linux/arm -t codercom/nbin-centos:arm -f centos.dockerfile
+           docker buildx build --platform linux/arm64 -t codercom/nbin-centos:arm64 -f centos.dockerfile
+      
+      - name: Build Images - ARM (Alpine)
+        command: |
+           docker buildx build --platform linux/arm -t codercom/nbin-alpine:arm -f alpine.dockerfile
+           docker buildx build --platform linux/arm64 -t codercom/nbin-alpine:arm64 -f alpine.dockerfile
+
+      - name: Build Images - AMD64 (CentOS)
+        command: docker buildx build --platform linux/amd64 -t codercom/nbin-centos:amd64 -f centos.dockerfile
+      
+      - name: Build Images - AMD64 (Alpine)
+        command: docker buildx build --platform linux/amd64 -t codercom/nbin-alpine:amd64 -f alpine.dockerfile
+
+  build_amd64:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Install Docker Edge Build (for Xbuild commands)
+        command: wget -qO - https://test.docker.com | sh
+      
+      - name: Setup Builder instance
+        command: |
+            docker buildx create --name cdr-build
+            docker buildx use cdr-build
+            docker buildx inspect --bootstrap
+
+      - name: Build Images - AMD64 (CentOS)
+        command: docker buildx build --platform linux/amd64 -t codercom/nbin-centos:amd64 -f centos.dockerfile
+      
+      - name: Build Images - AMD64 (Alpine)
+        command: docker buildx build --platform linux/amd64 -t codercom/nbin-alpine:amd64 -f alpine.dockerfile
\ No newline at end of file
diff --git a/.github/workflows/build-commit.yml b/.github/workflows/build-commit.yml
new file mode 100644
index 0000000..999c30a
--- /dev/null
+++ b/.github/workflows/build-commit.yml
@@ -0,0 +1,39 @@
+name: Build
+on:
+  push:
+    branches:
+       - 'sr229/docker-xbuild'
+       - 'master'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Install Docker Edge Build (for Xbuild commands)
+        command: wget -qO - https://test.docker.com | sh
+      
+      - name: Setup Builder instance
+        command: |
+            docker buildx create --name cdr-build
+            docker buildx use cdr-build
+            docker buildx inspect --bootstrap
+      
+      - name: Build Images - ARM (CentOS)
+        command: |
+           docker buildx build --platform linux/arm -t cdr/nbin-centos:arm -f centos.dockerfile
+           docker buildx build --platform linux/arm64 -t cdr/nbin-centos:arm64 -f centos.dockerfile
+      
+      - name: Build Images - ARM (Alpine)
+        command: |
+           docker buildx build --platform linux/arm -t cdr/nbin-alpine:arm -f alpine.dockerfile
+           docker buildx build --platform linux/arm64 -t cdr/nbin-alpine:arm64 -f alpine.dockerfile
+
+      - name: Build Images - AMD64 (CentOS)
+        command: |
+           docker buildx build --platform linux/amd64 -t cdr/nbin-centos:amd64 -f centos.dockerfile
+      
+      - name: Build Images - AMD64 (Alpine)
+        command: |
+           docker buildx build --platform linux/amd64 -t cdr/nbin-alpine:amd64 -f alpine.dockerfile
\ No newline at end of file
diff --git a/aarch64-alpine.dockerfile b/aarch64-alpine.dockerfile
deleted file mode 100644
index 8e76637..0000000
--- a/aarch64-alpine.dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM balenalib/aarch64-alpine-node:10.15-edge-build
-
-RUN ["cross-build-start"]
-
-RUN apk add --no-cache --no-progress bash gcc g++ ccache git make python linux-headers
-
-RUN ["cross-build-end"]
diff --git a/aarch64.dockerfile b/aarch64.dockerfile
deleted file mode 100644
index 52ef3d9..0000000
--- a/aarch64.dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM balenalib/aarch64-debian-node:10.15-jessie-build
-
-RUN ["cross-build-start"]
-
-RUN apt-get update && apt-get -y install build-essential linux-headers-3.16.0-6-all-arm64 linux-headers-3.16.0-6-common gcc g++ ccache git make
-
-RUN ["cross-build-end"]
diff --git a/armhf-alpine.dockerfile b/armhf-alpine.dockerfile
deleted file mode 100644
index 25bb72f..0000000
--- a/armhf-alpine.dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM balenalib/armv7hf-alpine-node:10.15-edge-build
-
-RUN ["cross-build-start"]
-
-RUN apk add --no-cache --no-progress bash gcc g++ ccache git make python linux-headers
-
-RUN ["cross-build-end"] 
diff --git a/armhf.dockerfile b/armhf.dockerfile
deleted file mode 100644
index ef581fb..0000000
--- a/armhf.dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM balenalib/armv7hf-debian-node:10.15-jessie-build
-
-RUN ["cross-build-start"]
-
-RUN apt-get update && apt-get -y install build-essential linux-headers-3.16.0-9-all-armhf linux-headers-3.16.0-9-common gcc g++ ccache git make
-
-RUN ["cross-build-end"]
diff --git a/scripts/docker_build.sh b/scripts/docker_build.sh
index 06c51b2..f143372 100755
--- a/scripts/docker_build.sh
+++ b/scripts/docker_build.sh
@@ -12,15 +12,15 @@ source ./vars.sh
 # $BINARY_NAME
 function docker_build() {
 	case "$IMAGE" in
-	*armv7hf* | armv7hf | aarch64 | *aarch64*)
-	containerID=$(docker create -it -v $HOME/$CACHE_DIR:/ccache $IMAGE)
+	*arm | *arm64)
+	containerID=$(docker buildx create -it -v $HOME/$CACHE_DIR:/ccache $IMAGE)
+	# HACK: We can leverage the same VMs we use to make x86 builds but in expense of using QEMU
+	docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
 	docker start $containerID
 	docker exec $containerID mkdir /src
 
 	function exec() {
-		# HACK: cross-build-start and cross-build end is needed to be wrapped around commands.
-		# This is inevitably the only way to perform cross-targeting in-Docker.
-		docker exec $containerID bash -c "cross-build-start; $@; cross-build-end"
+		docker exec $containerID bash -c "$@"
 	}
 
 		docker cp ../. $containerID:/src

From 3fec1d307e74e6e43616319c85af2997e4eab71e Mon Sep 17 00:00:00 2001
From: Ayane Satomi <sr229@coder.com>
Date: Mon, 30 Sep 2019 19:54:12 +0800
Subject: [PATCH 06/18] [ci] fix confusion with CircleCI

Signed-off-by: Ayane Satomi <sr229@coder.com>
---
 .github/workflows/build-commit-docker.yml | 24 +++++++++++------------
 .github/workflows/build-commit.yml        | 14 ++++++-------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build-commit-docker.yml b/.github/workflows/build-commit-docker.yml
index 31893dd..d3da868 100644
--- a/.github/workflows/build-commit-docker.yml
+++ b/.github/workflows/build-commit-docker.yml
@@ -11,47 +11,47 @@ jobs:
     steps:
       - uses: actions/checkout@master
 
-      - name: Install Docker Edge Build (for Xbuild commands)
-        command: wget -qO - https://test.docker.com | sh
+      - name: Install Docker Edge Build (for Xbuild runs)
+        run: wget -qO - https://test.docker.com | sh
       
       - name: Setup Builder instance
-        command: |
+        run: |
             docker buildx create --name cdr-build
             docker buildx use cdr-build
             docker buildx inspect --bootstrap
       
       - name: Build Images - ARM (CentOS)
-        command: |
+        run: |
            docker buildx build --platform linux/arm -t codercom/nbin-centos:arm -f centos.dockerfile
            docker buildx build --platform linux/arm64 -t codercom/nbin-centos:arm64 -f centos.dockerfile
       
       - name: Build Images - ARM (Alpine)
-        command: |
+        run: |
            docker buildx build --platform linux/arm -t codercom/nbin-alpine:arm -f alpine.dockerfile
            docker buildx build --platform linux/arm64 -t codercom/nbin-alpine:arm64 -f alpine.dockerfile
 
       - name: Build Images - AMD64 (CentOS)
-        command: docker buildx build --platform linux/amd64 -t codercom/nbin-centos:amd64 -f centos.dockerfile
+        run: docker buildx build --platform linux/amd64 -t codercom/nbin-centos:amd64 -f centos.dockerfile
       
       - name: Build Images - AMD64 (Alpine)
-        command: docker buildx build --platform linux/amd64 -t codercom/nbin-alpine:amd64 -f alpine.dockerfile
+        run: docker buildx build --platform linux/amd64 -t codercom/nbin-alpine:amd64 -f alpine.dockerfile
 
   build_amd64:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
 
-      - name: Install Docker Edge Build (for Xbuild commands)
-        command: wget -qO - https://test.docker.com | sh
+      - name: Install Docker Edge Build (for Xbuild runs)
+        run: wget -qO - https://test.docker.com | sh
       
       - name: Setup Builder instance
-        command: |
+        run: |
             docker buildx create --name cdr-build
             docker buildx use cdr-build
             docker buildx inspect --bootstrap
 
       - name: Build Images - AMD64 (CentOS)
-        command: docker buildx build --platform linux/amd64 -t codercom/nbin-centos:amd64 -f centos.dockerfile
+        run: docker buildx build --platform linux/amd64 -t codercom/nbin-centos:amd64 -f centos.dockerfile
       
       - name: Build Images - AMD64 (Alpine)
-        command: docker buildx build --platform linux/amd64 -t codercom/nbin-alpine:amd64 -f alpine.dockerfile
\ No newline at end of file
+        run: docker buildx build --platform linux/amd64 -t codercom/nbin-alpine:amd64 -f alpine.dockerfile
\ No newline at end of file
diff --git a/.github/workflows/build-commit.yml b/.github/workflows/build-commit.yml
index 999c30a..fe1b8f4 100644
--- a/.github/workflows/build-commit.yml
+++ b/.github/workflows/build-commit.yml
@@ -11,29 +11,29 @@ jobs:
     steps:
       - uses: actions/checkout@master
 
-      - name: Install Docker Edge Build (for Xbuild commands)
-        command: wget -qO - https://test.docker.com | sh
+      - name: Install Docker Edge Build (for Xbuild runs)
+        run: wget -qO - https://test.docker.com | sh
       
       - name: Setup Builder instance
-        command: |
+        run: |
             docker buildx create --name cdr-build
             docker buildx use cdr-build
             docker buildx inspect --bootstrap
       
       - name: Build Images - ARM (CentOS)
-        command: |
+        run: |
            docker buildx build --platform linux/arm -t cdr/nbin-centos:arm -f centos.dockerfile
            docker buildx build --platform linux/arm64 -t cdr/nbin-centos:arm64 -f centos.dockerfile
       
       - name: Build Images - ARM (Alpine)
-        command: |
+        run: |
            docker buildx build --platform linux/arm -t cdr/nbin-alpine:arm -f alpine.dockerfile
            docker buildx build --platform linux/arm64 -t cdr/nbin-alpine:arm64 -f alpine.dockerfile
 
       - name: Build Images - AMD64 (CentOS)
-        command: |
+        run: |
            docker buildx build --platform linux/amd64 -t cdr/nbin-centos:amd64 -f centos.dockerfile
       
       - name: Build Images - AMD64 (Alpine)
-        command: |
+        run: |
            docker buildx build --platform linux/amd64 -t cdr/nbin-alpine:amd64 -f alpine.dockerfile
\ No newline at end of file

From 650e9af4ef90d9a3a8ffd56482e7ae1689262e3a Mon Sep 17 00:00:00 2001
From: Ayane Satomi <sr229@coder.com>
Date: Mon, 30 Sep 2019 20:01:11 +0800
Subject: [PATCH 07/18] [ci] set experimental CLI opts to enabled

Signed-off-by: Ayane Satomi <sr229@coder.com>
---
 .github/workflows/build-commit-docker.yml | 18 ++++++++++--------
 .github/workflows/build-commit.yml        | 20 ++------------------
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/build-commit-docker.yml b/.github/workflows/build-commit-docker.yml
index d3da868..674b106 100644
--- a/.github/workflows/build-commit-docker.yml
+++ b/.github/workflows/build-commit-docker.yml
@@ -16,26 +16,23 @@ jobs:
       
       - name: Setup Builder instance
         run: |
+            export DOCKER_CLI_EXPERMIENTAL=enabled
             docker buildx create --name cdr-build
             docker buildx use cdr-build
             docker buildx inspect --bootstrap
       
       - name: Build Images - ARM (CentOS)
         run: |
+           export DOCKER_CLI_EXPERMIENTAL=enabled
            docker buildx build --platform linux/arm -t codercom/nbin-centos:arm -f centos.dockerfile
            docker buildx build --platform linux/arm64 -t codercom/nbin-centos:arm64 -f centos.dockerfile
       
       - name: Build Images - ARM (Alpine)
         run: |
+           export DOCKER_CLI_EXPERMIENTAL=enabled
            docker buildx build --platform linux/arm -t codercom/nbin-alpine:arm -f alpine.dockerfile
            docker buildx build --platform linux/arm64 -t codercom/nbin-alpine:arm64 -f alpine.dockerfile
 
-      - name: Build Images - AMD64 (CentOS)
-        run: docker buildx build --platform linux/amd64 -t codercom/nbin-centos:amd64 -f centos.dockerfile
-      
-      - name: Build Images - AMD64 (Alpine)
-        run: docker buildx build --platform linux/amd64 -t codercom/nbin-alpine:amd64 -f alpine.dockerfile
-
   build_amd64:
     runs-on: ubuntu-latest
     steps:
@@ -46,12 +43,17 @@ jobs:
       
       - name: Setup Builder instance
         run: |
+            export DOCKER_CLI_EXPERMIENTAL=enabled
             docker buildx create --name cdr-build
             docker buildx use cdr-build
             docker buildx inspect --bootstrap
 
       - name: Build Images - AMD64 (CentOS)
-        run: docker buildx build --platform linux/amd64 -t codercom/nbin-centos:amd64 -f centos.dockerfile
+        run: |
+          export DOCKER_CLI_EXPERMIENTAL=enabled
+          docker buildx build --platform linux/amd64 -t codercom/nbin-centos:amd64 -f centos.dockerfile
       
       - name: Build Images - AMD64 (Alpine)
-        run: docker buildx build --platform linux/amd64 -t codercom/nbin-alpine:amd64 -f alpine.dockerfile
\ No newline at end of file
+        run: |
+         export DOCKER_CLI_EXPERMIENTAL=enabled
+         docker buildx build --platform linux/amd64 -t codercom/nbin-alpine:amd64 -f alpine.dockerfile
\ No newline at end of file
diff --git a/.github/workflows/build-commit.yml b/.github/workflows/build-commit.yml
index fe1b8f4..c73f538 100644
--- a/.github/workflows/build-commit.yml
+++ b/.github/workflows/build-commit.yml
@@ -16,24 +16,8 @@ jobs:
       
       - name: Setup Builder instance
         run: |
+            export DOCKER_CLI_EXPERMIENTAL=enabled
             docker buildx create --name cdr-build
             docker buildx use cdr-build
             docker buildx inspect --bootstrap
-      
-      - name: Build Images - ARM (CentOS)
-        run: |
-           docker buildx build --platform linux/arm -t cdr/nbin-centos:arm -f centos.dockerfile
-           docker buildx build --platform linux/arm64 -t cdr/nbin-centos:arm64 -f centos.dockerfile
-      
-      - name: Build Images - ARM (Alpine)
-        run: |
-           docker buildx build --platform linux/arm -t cdr/nbin-alpine:arm -f alpine.dockerfile
-           docker buildx build --platform linux/arm64 -t cdr/nbin-alpine:arm64 -f alpine.dockerfile
-
-      - name: Build Images - AMD64 (CentOS)
-        run: |
-           docker buildx build --platform linux/amd64 -t cdr/nbin-centos:amd64 -f centos.dockerfile
-      
-      - name: Build Images - AMD64 (Alpine)
-        run: |
-           docker buildx build --platform linux/amd64 -t cdr/nbin-alpine:amd64 -f alpine.dockerfile
\ No newline at end of file
+          
\ No newline at end of file

From fee74b2b66cb550baa1fcf65145ccb881c80e7f6 Mon Sep 17 00:00:00 2001
From: Ayane Satomi <sr229@coder.com>
Date: Mon, 30 Sep 2019 20:09:50 +0800
Subject: [PATCH 08/18] [ci] install buildx manually

Signed-off-by: Ayane Satomi <sr229@coder.com>
---
 .github/workflows/build-commit-docker.yml | 10 ++++++++++
 .github/workflows/build-commit.yml        |  8 ++++++++
 2 files changed, 18 insertions(+)

diff --git a/.github/workflows/build-commit-docker.yml b/.github/workflows/build-commit-docker.yml
index 674b106..bd52e88 100644
--- a/.github/workflows/build-commit-docker.yml
+++ b/.github/workflows/build-commit-docker.yml
@@ -17,6 +17,7 @@ jobs:
       - name: Setup Builder instance
         run: |
             export DOCKER_CLI_EXPERMIENTAL=enabled
+            export DOCKER_BUILDKIT=1
             docker buildx create --name cdr-build
             docker buildx use cdr-build
             docker buildx inspect --bootstrap
@@ -24,12 +25,14 @@ jobs:
       - name: Build Images - ARM (CentOS)
         run: |
            export DOCKER_CLI_EXPERMIENTAL=enabled
+           export DOCKER_BUILDKIT=1
            docker buildx build --platform linux/arm -t codercom/nbin-centos:arm -f centos.dockerfile
            docker buildx build --platform linux/arm64 -t codercom/nbin-centos:arm64 -f centos.dockerfile
       
       - name: Build Images - ARM (Alpine)
         run: |
            export DOCKER_CLI_EXPERMIENTAL=enabled
+           export DOCKER_BUILDKIT=1
            docker buildx build --platform linux/arm -t codercom/nbin-alpine:arm -f alpine.dockerfile
            docker buildx build --platform linux/arm64 -t codercom/nbin-alpine:arm64 -f alpine.dockerfile
 
@@ -40,6 +43,13 @@ jobs:
 
       - name: Install Docker Edge Build (for Xbuild runs)
         run: wget -qO - https://test.docker.com | sh
+
+      - name: Install buildx
+        run: |
+          mkdir -p  $HOME/.docker/cli-plugins/
+          touch $HOME/.docker/cli-plugins/docker-buildx
+          wget -qO - https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.linux-amd64 > $HOME/.docker/cli-plugins/docker-buildx
+          chmod a+x $HOME/.docker/cli-plugins/docker-buildx
       
       - name: Setup Builder instance
         run: |
diff --git a/.github/workflows/build-commit.yml b/.github/workflows/build-commit.yml
index c73f538..5f9fd6e 100644
--- a/.github/workflows/build-commit.yml
+++ b/.github/workflows/build-commit.yml
@@ -13,6 +13,14 @@ jobs:
 
       - name: Install Docker Edge Build (for Xbuild runs)
         run: wget -qO - https://test.docker.com | sh
+
+      
+      - name: Install buildx
+        run: |
+          mkdir -p  $HOME/.docker/cli-plugins/
+          touch $HOME/.docker/cli-plugins/docker-buildx
+          wget -qO - https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.linux-amd64 > $HOME/.docker/cli-plugins/docker-buildx
+          chmod a+x $HOME/.docker/cli-plugins/docker-buildx
       
       - name: Setup Builder instance
         run: |

From 7ef1d30fa84bb6a8bb194461dcab92017259b279 Mon Sep 17 00:00:00 2001
From: Ayane Satomi <sr229@coder.com>
Date: Mon, 30 Sep 2019 20:16:14 +0800
Subject: [PATCH 09/18] [ci] sync changes from commit

Signed-off-by: Ayane Satomi <sr229@coder.com>
---
 .github/workflows/build-commit-docker.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-commit-docker.yml b/.github/workflows/build-commit-docker.yml
index bd52e88..7b43770 100644
--- a/.github/workflows/build-commit-docker.yml
+++ b/.github/workflows/build-commit-docker.yml
@@ -14,10 +14,16 @@ jobs:
       - name: Install Docker Edge Build (for Xbuild runs)
         run: wget -qO - https://test.docker.com | sh
       
+      - name: Install buildx
+        run: |
+          mkdir -p  $HOME/.docker/cli-plugins/
+          touch $HOME/.docker/cli-plugins/docker-buildx
+          wget -qO - https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.linux-amd64 > $HOME/.docker/cli-plugins/docker-buildx
+          chmod a+x $HOME/.docker/cli-plugins/docker-buildx
+      
       - name: Setup Builder instance
         run: |
             export DOCKER_CLI_EXPERMIENTAL=enabled
-            export DOCKER_BUILDKIT=1
             docker buildx create --name cdr-build
             docker buildx use cdr-build
             docker buildx inspect --bootstrap

From aab62016c592453737b2a7cd90d6dee6d567e79e Mon Sep 17 00:00:00 2001
From: Ayane Satomi <sr229@coder.com>
Date: Mon, 30 Sep 2019 20:19:52 +0800
Subject: [PATCH 10/18] [ci] add the almighty dot of context

Signed-off-by: Ayane Satomi <sr229@coder.com>
---
 .github/workflows/build-commit-docker.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-commit-docker.yml b/.github/workflows/build-commit-docker.yml
index 7b43770..582b114 100644
--- a/.github/workflows/build-commit-docker.yml
+++ b/.github/workflows/build-commit-docker.yml
@@ -32,15 +32,15 @@ jobs:
         run: |
            export DOCKER_CLI_EXPERMIENTAL=enabled
            export DOCKER_BUILDKIT=1
-           docker buildx build --platform linux/arm -t codercom/nbin-centos:arm -f centos.dockerfile
-           docker buildx build --platform linux/arm64 -t codercom/nbin-centos:arm64 -f centos.dockerfile
+           docker buildx build --platform linux/arm -t codercom/nbin-centos:arm -f centos.dockerfile .
+           docker buildx build --platform linux/arm64 -t codercom/nbin-centos:arm64 -f centos.dockerfile .
       
       - name: Build Images - ARM (Alpine)
         run: |
            export DOCKER_CLI_EXPERMIENTAL=enabled
            export DOCKER_BUILDKIT=1
-           docker buildx build --platform linux/arm -t codercom/nbin-alpine:arm -f alpine.dockerfile
-           docker buildx build --platform linux/arm64 -t codercom/nbin-alpine:arm64 -f alpine.dockerfile
+           docker buildx build --platform linux/arm -t codercom/nbin-alpine:arm -f alpine.dockerfile .
+           docker buildx build --platform linux/arm64 -t codercom/nbin-alpine:arm64 -f alpine.dockerfile .
 
   build_amd64:
     runs-on: ubuntu-latest
@@ -67,9 +67,9 @@ jobs:
       - name: Build Images - AMD64 (CentOS)
         run: |
           export DOCKER_CLI_EXPERMIENTAL=enabled
-          docker buildx build --platform linux/amd64 -t codercom/nbin-centos:amd64 -f centos.dockerfile
+          docker buildx build --platform linux/amd64 -t codercom/nbin-centos:amd64 -f centos.dockerfile .
       
       - name: Build Images - AMD64 (Alpine)
         run: |
          export DOCKER_CLI_EXPERMIENTAL=enabled
-         docker buildx build --platform linux/amd64 -t codercom/nbin-alpine:amd64 -f alpine.dockerfile
\ No newline at end of file
+         docker buildx build --platform linux/amd64 -t codercom/nbin-alpine:amd64 -f alpine.dockerfile .
\ No newline at end of file

From 37ddc4b4ca6bde8e610b679bbccc74b2434a6ee5 Mon Sep 17 00:00:00 2001
From: Ayane Satomi <sr229@coder.com>
Date: Mon, 30 Sep 2019 20:26:26 +0800
Subject: [PATCH 11/18] [ci] add qemu-user-static container to do
 cross-building

Signed-off-by: Ayane Satomi <sr229@coder.com>
---
 .github/workflows/build-commit-docker.yml | 5 +++--
 .github/workflows/build-commit.yml        | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-commit-docker.yml b/.github/workflows/build-commit-docker.yml
index 582b114..4b5675a 100644
--- a/.github/workflows/build-commit-docker.yml
+++ b/.github/workflows/build-commit-docker.yml
@@ -24,21 +24,21 @@ jobs:
       - name: Setup Builder instance
         run: |
             export DOCKER_CLI_EXPERMIENTAL=enabled
+            docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
             docker buildx create --name cdr-build
             docker buildx use cdr-build
             docker buildx inspect --bootstrap
+            docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
       
       - name: Build Images - ARM (CentOS)
         run: |
            export DOCKER_CLI_EXPERMIENTAL=enabled
-           export DOCKER_BUILDKIT=1
            docker buildx build --platform linux/arm -t codercom/nbin-centos:arm -f centos.dockerfile .
            docker buildx build --platform linux/arm64 -t codercom/nbin-centos:arm64 -f centos.dockerfile .
       
       - name: Build Images - ARM (Alpine)
         run: |
            export DOCKER_CLI_EXPERMIENTAL=enabled
-           export DOCKER_BUILDKIT=1
            docker buildx build --platform linux/arm -t codercom/nbin-alpine:arm -f alpine.dockerfile .
            docker buildx build --platform linux/arm64 -t codercom/nbin-alpine:arm64 -f alpine.dockerfile .
 
@@ -60,6 +60,7 @@ jobs:
       - name: Setup Builder instance
         run: |
             export DOCKER_CLI_EXPERMIENTAL=enabled
+            docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
             docker buildx create --name cdr-build
             docker buildx use cdr-build
             docker buildx inspect --bootstrap
diff --git a/.github/workflows/build-commit.yml b/.github/workflows/build-commit.yml
index 5f9fd6e..061d723 100644
--- a/.github/workflows/build-commit.yml
+++ b/.github/workflows/build-commit.yml
@@ -25,6 +25,7 @@ jobs:
       - name: Setup Builder instance
         run: |
             export DOCKER_CLI_EXPERMIENTAL=enabled
+            docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
             docker buildx create --name cdr-build
             docker buildx use cdr-build
             docker buildx inspect --bootstrap

From 6dd88a345248b65413ce8c279701f05a1d9f0f41 Mon Sep 17 00:00:00 2001
From: Ayane Satomi <sr229@coder.com>
Date: Mon, 30 Sep 2019 20:55:37 +0800
Subject: [PATCH 12/18] [ci] split ARM and ARM64 builds from each other

Signed-off-by: Ayane Satomi <sr229@coder.com>
---
 .github/workflows/build-commit-docker.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-commit-docker.yml b/.github/workflows/build-commit-docker.yml
index 4b5675a..35e97e9 100644
--- a/.github/workflows/build-commit-docker.yml
+++ b/.github/workflows/build-commit-docker.yml
@@ -30,17 +30,25 @@ jobs:
             docker buildx inspect --bootstrap
             docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
       
+      - name: Build Images - ARM64 (CentOS)
+        run: |
+           export DOCKER_CLI_EXPERMIENTAL=enabled
+           docker buildx build --platform linux/arm64 -t codercom/nbin-centos:arm64 -f centos.dockerfile .
+
       - name: Build Images - ARM (CentOS)
         run: |
            export DOCKER_CLI_EXPERMIENTAL=enabled
            docker buildx build --platform linux/arm -t codercom/nbin-centos:arm -f centos.dockerfile .
-           docker buildx build --platform linux/arm64 -t codercom/nbin-centos:arm64 -f centos.dockerfile .
       
+      - name: Build Images - ARM64 (Alpine)
+        run: |
+           export DOCKER_CLI_EXPERMIENTAL=enabled
+           docker buildx build --platform linux/arm64 -t codercom/nbin-alpine:arm64 -f alpine.dockerfile .
+
       - name: Build Images - ARM (Alpine)
         run: |
            export DOCKER_CLI_EXPERMIENTAL=enabled
            docker buildx build --platform linux/arm -t codercom/nbin-alpine:arm -f alpine.dockerfile .
-           docker buildx build --platform linux/arm64 -t codercom/nbin-alpine:arm64 -f alpine.dockerfile .
 
   build_amd64:
     runs-on: ubuntu-latest

From d03851e585fe049a62847a667aa183f67f54866a Mon Sep 17 00:00:00 2001
From: Ayane Satomi <sr229@coder.com>
Date: Mon, 30 Sep 2019 21:00:23 +0800
Subject: [PATCH 13/18] [ci] proactively update centos

Signed-off-by: Ayane Satomi <sr229@coder.com>
---
 .github/workflows/release-docker.yml | 103 +++++++++++++++++++++++++++
 centos.dockerfile                    |   2 +-
 2 files changed, 104 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/release-docker.yml

diff --git a/.github/workflows/release-docker.yml b/.github/workflows/release-docker.yml
new file mode 100644
index 0000000..3392718
--- /dev/null
+++ b/.github/workflows/release-docker.yml
@@ -0,0 +1,103 @@
+name: Build Docker images
+on:
+  - release
+
+jobs:
+  build_arm:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Install Docker Edge Build (for Xbuild runs)
+        run: wget -qO - https://test.docker.com | sh
+      
+      - name: Install buildx
+        run: |
+          mkdir -p  $HOME/.docker/cli-plugins/
+          touch $HOME/.docker/cli-plugins/docker-buildx
+          wget -qO - https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.linux-amd64 > $HOME/.docker/cli-plugins/docker-buildx
+          chmod a+x $HOME/.docker/cli-plugins/docker-buildx
+      
+      - name: Setup Builder instance
+        run: |
+            export DOCKER_CLI_EXPERMIENTAL=enabled
+            docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+            docker buildx create --name cdr-build
+            docker buildx use cdr-build
+            docker buildx inspect --bootstrap
+            docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+      
+      - name: Build Images - ARM64 (CentOS)
+        run: |
+           export DOCKER_CLI_EXPERMIENTAL=enabled
+           docker buildx build --platform linux/arm64 -t codercom/nbin-centos:arm64 -f centos.dockerfile .
+
+      - name: Build Images - ARM (CentOS)
+        run: |
+           export DOCKER_CLI_EXPERMIENTAL=enabled
+           docker buildx build --platform linux/arm -t codercom/nbin-centos:arm -f centos.dockerfile .
+      
+      - name: Build Images - ARM64 (Alpine)
+        run: |
+           export DOCKER_CLI_EXPERMIENTAL=enabled
+           docker buildx build --platform linux/arm64 -t codercom/nbin-alpine:arm64 -f alpine.dockerfile .
+
+      - name: Build Images - ARM (Alpine)
+        run: |
+           export DOCKER_CLI_EXPERMIENTAL=enabled
+           docker buildx build --platform linux/arm -t codercom/nbin-alpine:arm -f alpine.dockerfile .
+
+      - uses: azure/docker-login@master
+        with:
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+
+      - name: "Push to Registry"
+        run: |
+          docker push codercom/nbin-centos:arm
+          docker push codercom/nbin-alpine:arm   
+          docker push codercom/nbin-centos:arm64
+          docker push codercom/nbin-alpine:arm64
+
+  build_amd64:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Install Docker Edge Build (for Xbuild runs)
+        run: wget -qO - https://test.docker.com | sh
+
+      - name: Install buildx
+        run: |
+          mkdir -p  $HOME/.docker/cli-plugins/
+          touch $HOME/.docker/cli-plugins/docker-buildx
+          wget -qO - https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.linux-amd64 > $HOME/.docker/cli-plugins/docker-buildx
+          chmod a+x $HOME/.docker/cli-plugins/docker-buildx
+      
+      - name: Setup Builder instance
+        run: |
+            export DOCKER_CLI_EXPERMIENTAL=enabled
+            docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+            docker buildx create --name cdr-build
+            docker buildx use cdr-build
+            docker buildx inspect --bootstrap
+
+      - name: Build Images - AMD64 (CentOS)
+        run: |
+          export DOCKER_CLI_EXPERMIENTAL=enabled
+          docker buildx build --platform linux/amd64 -t codercom/nbin-centos:amd64 -f centos.dockerfile .
+      
+      - name: Build Images - AMD64 (Alpine)
+        run: |
+         export DOCKER_CLI_EXPERMIENTAL=enabled
+         docker buildx build --platform linux/amd64 -t codercom/nbin-alpine:amd64 -f alpine.dockerfile .
+      
+      - uses: azure/docker-login@master
+        with:
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+
+      - name: "Push to Registry"
+        run: |
+          docker push codercom/nbin-centos:amd64
+          docker push codercom/nbin-alpine:amd64        
\ No newline at end of file
diff --git a/centos.dockerfile b/centos.dockerfile
index 27698a5..ce2bf92 100644
--- a/centos.dockerfile
+++ b/centos.dockerfile
@@ -1,6 +1,6 @@
 FROM centos:7
 
-RUN yum install -y centos-release-scl
+RUN yum -y update && yum install -y centos-release-scl
 RUN yum-config-manager --enable rhel-server-rhscl-7-rpms
 RUN yum install -y devtoolset-6
 RUN yum install -y gcc-c++

From 37e10e2e8b2533adeb430f5a490f8708b9554150 Mon Sep 17 00:00:00 2001
From: Ayane Satomi <sr229@coder.com>
Date: Mon, 30 Sep 2019 21:16:55 +0800
Subject: [PATCH 14/18] [ci] compile for devtoolset-7

who still uses CentOS 6 in this day and age? What are you, a dinosaur?

Signed-off-by: Ayane Satomi <sr229@coder.com>
---
 centos.dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/centos.dockerfile b/centos.dockerfile
index ce2bf92..b63c4b0 100644
--- a/centos.dockerfile
+++ b/centos.dockerfile
@@ -1,8 +1,8 @@
 FROM centos:7
 
-RUN yum -y update && yum install -y centos-release-scl
+RUN yum install -y centos-release-scl
 RUN yum-config-manager --enable rhel-server-rhscl-7-rpms
-RUN yum install -y devtoolset-6
+RUN yum install -y devtoolset-7
 RUN yum install -y gcc-c++
 RUN rpm -Uvh http://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.3.4-1.el7.x86_64.rpm
 

From f51538fa920a01d5f8907218fb759df4cd26a66b Mon Sep 17 00:00:00 2001
From: Ayane Satomi <sr229@coder.com>
Date: Mon, 30 Sep 2019 21:23:28 +0800
Subject: [PATCH 15/18] [ci] disable CentOS builds for ARM

We'll be targeting them via Ubuntu instead from now on

Signed-off-by: Ayane Satomi <sr229@coder.com>
---
 .github/workflows/build-commit-docker.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-commit-docker.yml b/.github/workflows/build-commit-docker.yml
index 35e97e9..24303ea 100644
--- a/.github/workflows/build-commit-docker.yml
+++ b/.github/workflows/build-commit-docker.yml
@@ -29,16 +29,16 @@ jobs:
             docker buildx use cdr-build
             docker buildx inspect --bootstrap
             docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-      
-      - name: Build Images - ARM64 (CentOS)
-        run: |
-           export DOCKER_CLI_EXPERMIENTAL=enabled
-           docker buildx build --platform linux/arm64 -t codercom/nbin-centos:arm64 -f centos.dockerfile .
-
-      - name: Build Images - ARM (CentOS)
-        run: |
-           export DOCKER_CLI_EXPERMIENTAL=enabled
-           docker buildx build --platform linux/arm -t codercom/nbin-centos:arm -f centos.dockerfile .
+#  TODO: AArch64 support is broken for CentOS.            
+#      - name: Build Images - ARM64 (CentOS)
+#        run: |
+#           export DOCKER_CLI_EXPERMIENTAL=enabled
+#           docker buildx build --platform linux/arm64 -t codercom/nbin-centos:arm64 -f centos.dockerfile .
+#  TODO: AArch64 support is broken for CentOS.
+#      - name: Build Images - ARM (CentOS)
+#        run: |
+#           export DOCKER_CLI_EXPERMIENTAL=enabled
+#           docker buildx build --platform linux/arm -t codercom/nbin-centos:arm -f centos.dockerfile .
       
       - name: Build Images - ARM64 (Alpine)
         run: |

From 4f0cdb6ff6ad6f3fdb358f2d78b6346ded203adc Mon Sep 17 00:00:00 2001
From: Ayane Satomi <sr229@coder.com>
Date: Mon, 30 Sep 2019 21:36:13 +0800
Subject: [PATCH 16/18] [nbin] add different targets for ARM

 we cannot compile it in CentOS without breaking backwards-compat (switching to CentOS 8)

Signed-off-by: Ayane Satomi <sr229@coder.com>
---
 .github/workflows/build-commit-docker.yml | 20 ++++++++++----------
 .github/workflows/release-docker.yml      | 12 ++++++------
 arm.dockerfile                            |  6 ++++++
 3 files changed, 22 insertions(+), 16 deletions(-)
 create mode 100644 arm.dockerfile

diff --git a/.github/workflows/build-commit-docker.yml b/.github/workflows/build-commit-docker.yml
index 24303ea..efb6d58 100644
--- a/.github/workflows/build-commit-docker.yml
+++ b/.github/workflows/build-commit-docker.yml
@@ -29,16 +29,16 @@ jobs:
             docker buildx use cdr-build
             docker buildx inspect --bootstrap
             docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-#  TODO: AArch64 support is broken for CentOS.            
-#      - name: Build Images - ARM64 (CentOS)
-#        run: |
-#           export DOCKER_CLI_EXPERMIENTAL=enabled
-#           docker buildx build --platform linux/arm64 -t codercom/nbin-centos:arm64 -f centos.dockerfile .
-#  TODO: AArch64 support is broken for CentOS.
-#      - name: Build Images - ARM (CentOS)
-#        run: |
-#           export DOCKER_CLI_EXPERMIENTAL=enabled
-#           docker buildx build --platform linux/arm -t codercom/nbin-centos:arm -f centos.dockerfile .
+            
+      - name: Build Images - ARM64
+        run: |
+           export DOCKER_CLI_EXPERMIENTAL=enabled
+           docker buildx build --platform linux/arm64 -t codercom/nbin-arm:arm64 -f arm.dockerfile .
+
+      - name: Build Images - ARM
+        run: |
+           export DOCKER_CLI_EXPERMIENTAL=enabled
+           docker buildx build --platform linux/arm -t codercom/nbin-arm:arm -f arm.dockerfile .
       
       - name: Build Images - ARM64 (Alpine)
         run: |
diff --git a/.github/workflows/release-docker.yml b/.github/workflows/release-docker.yml
index 3392718..4e6463f 100644
--- a/.github/workflows/release-docker.yml
+++ b/.github/workflows/release-docker.yml
@@ -27,15 +27,15 @@ jobs:
             docker buildx inspect --bootstrap
             docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
       
-      - name: Build Images - ARM64 (CentOS)
+      - name: Build Images - ARM64
         run: |
            export DOCKER_CLI_EXPERMIENTAL=enabled
-           docker buildx build --platform linux/arm64 -t codercom/nbin-centos:arm64 -f centos.dockerfile .
+           docker buildx build --platform linux/arm64 -t codercom/nbin-arm:arm64 -f arm.dockerfile .
 
-      - name: Build Images - ARM (CentOS)
+      - name: Build Images - ARM
         run: |
            export DOCKER_CLI_EXPERMIENTAL=enabled
-           docker buildx build --platform linux/arm -t codercom/nbin-centos:arm -f centos.dockerfile .
+           docker buildx build --platform linux/arm -t codercom/nbin-arm:arm -f arm.dockerfile .
       
       - name: Build Images - ARM64 (Alpine)
         run: |
@@ -54,9 +54,9 @@ jobs:
 
       - name: "Push to Registry"
         run: |
-          docker push codercom/nbin-centos:arm
+          docker push codercom/nbin-arm:arm
           docker push codercom/nbin-alpine:arm   
-          docker push codercom/nbin-centos:arm64
+          docker push codercom/nbin-arm:arm64
           docker push codercom/nbin-alpine:arm64
 
   build_amd64:
diff --git a/arm.dockerfile b/arm.dockerfile
new file mode 100644
index 0000000..c4f815c
--- /dev/null
+++ b/arm.dockerfile
@@ -0,0 +1,6 @@
+# Debian Target - only for ARM builds.
+# DO NOT USE THIS AS A TARGET FOR x86!
+FROM debian:8
+
+RUN apt update && \
+    apt install -y build-essential g++ gcc linux-headers-generic

From df4a93f8b9582a77cb4a7577dbf63186b5198a41 Mon Sep 17 00:00:00 2001
From: Ayane Satomi <sr229@coder.com>
Date: Mon, 30 Sep 2019 21:45:37 +0800
Subject: [PATCH 17/18] [ci] switch to Ubuntu base

Signed-off-by: Ayane Satomi <sr229@coder.com>
---
 arm.dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arm.dockerfile b/arm.dockerfile
index c4f815c..9f3a1d0 100644
--- a/arm.dockerfile
+++ b/arm.dockerfile
@@ -1,6 +1,6 @@
 # Debian Target - only for ARM builds.
 # DO NOT USE THIS AS A TARGET FOR x86!
-FROM debian:8
+FROM ubuntu:18.04
 
 RUN apt update && \
     apt install -y build-essential g++ gcc linux-headers-generic

From ee8ebdc0bf25b63e5face074ee39c1983d6b25ea Mon Sep 17 00:00:00 2001
From: Ayane Satomi <sr229@coder.com>
Date: Tue, 1 Oct 2019 00:56:22 +0800
Subject: [PATCH 18/18] [ci] update names for pending ARM support

Signed-off-by: Ayane Satomi <sr229@coder.com>
---
 .github/workflows/build-commit-docker.yml | 12 ++++++------
 .github/workflows/build-commit.yml        |  3 +++
 .github/workflows/release-docker.yml      |  8 ++++----
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-commit-docker.yml b/.github/workflows/build-commit-docker.yml
index efb6d58..58d6300 100644
--- a/.github/workflows/build-commit-docker.yml
+++ b/.github/workflows/build-commit-docker.yml
@@ -33,22 +33,22 @@ jobs:
       - name: Build Images - ARM64
         run: |
            export DOCKER_CLI_EXPERMIENTAL=enabled
-           docker buildx build --platform linux/arm64 -t codercom/nbin-arm:arm64 -f arm.dockerfile .
+           docker buildx build --platform linux/arm64 -t codercom/nbin-arm64:latest -f arm.dockerfile .
 
       - name: Build Images - ARM
         run: |
            export DOCKER_CLI_EXPERMIENTAL=enabled
-           docker buildx build --platform linux/arm -t codercom/nbin-arm:arm -f arm.dockerfile .
+           docker buildx build --platform linux/arm -t codercom/nbin-arm:latest -f arm.dockerfile .
       
       - name: Build Images - ARM64 (Alpine)
         run: |
            export DOCKER_CLI_EXPERMIENTAL=enabled
-           docker buildx build --platform linux/arm64 -t codercom/nbin-alpine:arm64 -f alpine.dockerfile .
+           docker buildx build --platform linux/arm64 -t codercom/nbin-alpine-arm64:latest -f alpine.dockerfile .
 
       - name: Build Images - ARM (Alpine)
         run: |
            export DOCKER_CLI_EXPERMIENTAL=enabled
-           docker buildx build --platform linux/arm -t codercom/nbin-alpine:arm -f alpine.dockerfile .
+           docker buildx build --platform linux/arm -t codercom/nbin-alpine-arm:latest -f alpine.dockerfile .
 
   build_amd64:
     runs-on: ubuntu-latest
@@ -76,9 +76,9 @@ jobs:
       - name: Build Images - AMD64 (CentOS)
         run: |
           export DOCKER_CLI_EXPERMIENTAL=enabled
-          docker buildx build --platform linux/amd64 -t codercom/nbin-centos:amd64 -f centos.dockerfile .
+          docker buildx build --platform linux/amd64 -t codercom/nbin-centos:latest -f centos.dockerfile .
       
       - name: Build Images - AMD64 (Alpine)
         run: |
          export DOCKER_CLI_EXPERMIENTAL=enabled
-         docker buildx build --platform linux/amd64 -t codercom/nbin-alpine:amd64 -f alpine.dockerfile .
\ No newline at end of file
+         docker buildx build --platform linux/amd64 -t codercom/nbin-alpine:latest -f alpine.dockerfile .
\ No newline at end of file
diff --git a/.github/workflows/build-commit.yml b/.github/workflows/build-commit.yml
index 061d723..c8f6af5 100644
--- a/.github/workflows/build-commit.yml
+++ b/.github/workflows/build-commit.yml
@@ -29,4 +29,7 @@ jobs:
             docker buildx create --name cdr-build
             docker buildx use cdr-build
             docker buildx inspect --bootstrap
+      
+      - name: Build for ARM
+        run: scripts/ci.bash 
           
\ No newline at end of file
diff --git a/.github/workflows/release-docker.yml b/.github/workflows/release-docker.yml
index 4e6463f..babc67c 100644
--- a/.github/workflows/release-docker.yml
+++ b/.github/workflows/release-docker.yml
@@ -54,10 +54,10 @@ jobs:
 
       - name: "Push to Registry"
         run: |
-          docker push codercom/nbin-arm:arm
-          docker push codercom/nbin-alpine:arm   
-          docker push codercom/nbin-arm:arm64
-          docker push codercom/nbin-alpine:arm64
+          docker push codercom/nbin-arm:latest
+          docker push codercom/nbin-alpine-arm:latest   
+          docker push codercom/nbin-arm64:latest
+          docker push codercom/nbin-alpine-arm64:latest
 
   build_amd64:
     runs-on: ubuntu-latest