From 5ce694c52fb35e84d4127e452df5e1c8045f330a Mon Sep 17 00:00:00 2001
From: Nick Vyzas <nick@sysown.com>
Date: Wed, 28 Oct 2020 21:42:56 +0200
Subject: [PATCH] Fixes amd64 packaging after arm changes (#3124)

---
 .gitignore                                    |  1 +
 deps/libmicrohttpd/libmicrohttpd              |  2 +-
 docker-compose.yml                            | 28 +++++++++++++++++++
 .../deb-compliant/entrypoint/entrypoint.bash  |  7 ++---
 .../rhel-compliant/entrypoint/entrypoint.bash |  6 +---
 .../rhel7/entrypoint/entrypoint.bash          |  6 +---
 6 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index c6f70bf9d6..c2fce0d61d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -111,6 +111,7 @@ deps/libconfig/libconfig-1.7.2/
 #libmicrohttpd
 deps/libmicrohttpd/libmicrohttpd-0.9.55/
 deps/libmicrohttpd/libmicrohttpd-0.9.68/
+deps/libmicrohttpd/libmicrohttpd
 
 #libhttpserver
 deps/libhttpserver/libhttpserver-master_20191121/
diff --git a/deps/libmicrohttpd/libmicrohttpd b/deps/libmicrohttpd/libmicrohttpd
index f4be94a802..9c350c309e 120000
--- a/deps/libmicrohttpd/libmicrohttpd
+++ b/deps/libmicrohttpd/libmicrohttpd
@@ -1 +1 @@
-libmicrohttpd-0.9.68
\ No newline at end of file
+libmicrohttpd-0.9.55
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index adc838ced4..8da28a0de5 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,6 +12,7 @@ services:
       - MAKEOPT
       - CURVER
       - PKG_RELEASE=centos67
+      - PROXYSQL_BUILD_ARCH=x86_64
     command:
       - /opt/entrypoint/entrypoint.bash
   centos67_dbg_build:
@@ -27,6 +28,7 @@ services:
       - CURVER
       - PKG_RELEASE=dbg-centos67
       - PROXYSQL_BUILD_TYPE=debug
+      - PROXYSQL_BUILD_ARCH=x86_64
     command:
       - /opt/entrypoint/entrypoint.bash
   centos7_build:
@@ -41,6 +43,7 @@ services:
       - CURVER
       - PKG_RELEASE=centos7
       - PROXYSQL_BUILD_TYPE=clickhouse
+      - PROXYSQL_BUILD_ARCH=x86_64
     command:
       - /opt/entrypoint/entrypoint.bash
   centos7_arm64_build:
@@ -70,6 +73,7 @@ services:
       - CURVER
       - PKG_RELEASE=dbg-centos7
       - PROXYSQL_BUILD_TYPE=debug
+      - PROXYSQL_BUILD_ARCH=x86_64
     command:
       - /opt/entrypoint/entrypoint.bash
   centos8_build:
@@ -84,6 +88,7 @@ services:
       - CURVER
       - PKG_RELEASE=centos8
       - PROXYSQL_BUILD_TYPE=clickhouse
+      - PROXYSQL_BUILD_ARCH=x86_64
     command:
       - /opt/entrypoint/entrypoint.bash
   centos8_arm64_build:
@@ -113,6 +118,7 @@ services:
       - CURVER
       - PKG_RELEASE=dbg-centos8
       - PROXYSQL_BUILD_TYPE=debug
+      - PROXYSQL_BUILD_ARCH=x86_64
     command:
       - /opt/entrypoint/entrypoint.bash
   fedora24_build:
@@ -127,6 +133,7 @@ services:
       - CURVER
       - PKG_RELEASE=fedora24
       - PROXYSQL_BUILD_TYPE=clickhouse
+      - PROXYSQL_BUILD_ARCH=x86_64
     command:
       - /opt/entrypoint/entrypoint.bash
   fedora24_dbg_build:
@@ -141,6 +148,7 @@ services:
       - CURVER
       - PKG_RELEASE=dbg-fedora24
       - PROXYSQL_BUILD_TYPE=debug
+      - PROXYSQL_BUILD_ARCH=x86_64
     command:
       - /opt/entrypoint/entrypoint.bash
   fedora27_build:
@@ -155,6 +163,7 @@ services:
       - CURVER
       - PKG_RELEASE=fedora27
       - PROXYSQL_BUILD_TYPE=clickhouse
+      - PROXYSQL_BUILD_ARCH=x86_64
     command:
       - /opt/entrypoint/entrypoint.bash
   fedora27_dbg_build:
@@ -169,6 +178,7 @@ services:
       - CURVER
       - PKG_RELEASE=dbg-fedora27
       - PROXYSQL_BUILD_TYPE=debug
+      - PROXYSQL_BUILD_ARCH=x86_64
     command:
       - /opt/entrypoint/entrypoint.bash
   fedora28_build:
@@ -183,6 +193,7 @@ services:
       - CURVER
       - PKG_RELEASE=fedora28
       - PROXYSQL_BUILD_TYPE=clickhouse
+      - PROXYSQL_BUILD_ARCH=x86_64
     command:
       - /opt/entrypoint/entrypoint.bash
   fedora28_dbg_build:
@@ -197,6 +208,7 @@ services:
       - CURVER
       - PKG_RELEASE=dbg-fedora28
       - PROXYSQL_BUILD_TYPE=debug
+      - PROXYSQL_BUILD_ARCH=x86_64
     command:
       - /opt/entrypoint/entrypoint.bash
   fedora32_arm64_build:
@@ -225,6 +237,7 @@ services:
       - MAKEOPT
       - CURVER
       - PKG_RELEASE=debian8
+      - PROXYSQL_BUILD_ARCH=amd64
     command:
       - /opt/entrypoint/entrypoint.bash
   debian8_dbg_build:
@@ -239,6 +252,7 @@ services:
       - CURVER
       - PKG_RELEASE=dbg-debian8
       - PROXYSQL_BUILD_TYPE=debug
+      - PROXYSQL_BUILD_ARCH=amd64
     command:
       - /opt/entrypoint/entrypoint.bash
   debian9_build:
@@ -253,6 +267,7 @@ services:
       - CURVER
       - PKG_RELEASE=debian9
       - PROXYSQL_BUILD_TYPE=clickhouse
+      - PROXYSQL_BUILD_ARCH=amd64
     command:
       - /opt/entrypoint/entrypoint.bash
   debian9_arm64_build:
@@ -282,6 +297,7 @@ services:
       - CURVER
       - PKG_RELEASE=dbg-debian9
       - PROXYSQL_BUILD_TYPE=debug
+      - PROXYSQL_BUILD_ARCH=amd64
     command:
       - /opt/entrypoint/entrypoint.bash
   debian9.4_build:
@@ -296,6 +312,7 @@ services:
       - CURVER
       - PKG_RELEASE=debian9.4
       - PROXYSQL_BUILD_TYPE=clickhouse
+      - PROXYSQL_BUILD_ARCH=amd64
     command:
       - /opt/entrypoint/entrypoint.bash
   debian9.4_dbg_build:
@@ -310,6 +327,7 @@ services:
       - CURVER
       - PKG_RELEASE=dbg-debian9.4
       - PROXYSQL_BUILD_TYPE=debug
+      - PROXYSQL_BUILD_ARCH=amd64
     command:
       - /opt/entrypoint/entrypoint.bash
   debian10_build:
@@ -324,6 +342,7 @@ services:
       - CURVER
       - PKG_RELEASE=debian10
       - PROXYSQL_BUILD_TYPE=clickhouse
+      - PROXYSQL_BUILD_ARCH=amd64
     command:
       - /opt/entrypoint/entrypoint.bash
   debian10_arm64_build:
@@ -353,6 +372,7 @@ services:
       - CURVER
       - PKG_RELEASE=dbg-debian10
       - PROXYSQL_BUILD_TYPE=debug
+      - PROXYSQL_BUILD_ARCH=amd64
     command:
       - /opt/entrypoint/entrypoint.bash
   ubuntu14_build:
@@ -366,6 +386,7 @@ services:
       - MAKEOPT
       - CURVER
       - PKG_RELEASE=ubuntu14
+      - PROXYSQL_BUILD_ARCH=amd64
     command:
       - /opt/entrypoint/entrypoint.bash
   ubuntu14_dbg_build:
@@ -380,6 +401,7 @@ services:
       - CURVER
       - PKG_RELEASE=dbg-ubuntu14
       - PROXYSQL_BUILD_TYPE=debug
+      - PROXYSQL_BUILD_ARCH=amd64
     command:
       - /opt/entrypoint/entrypoint.bash
   ubuntu16_build:
@@ -394,6 +416,7 @@ services:
       - CURVER
       - PKG_RELEASE=ubuntu16
       - PROXYSQL_BUILD_TYPE=clickhouse
+      - PROXYSQL_BUILD_ARCH=amd64
     command:
       - /opt/entrypoint/entrypoint.bash
   ubuntu16_dbg_build:
@@ -408,6 +431,7 @@ services:
       - CURVER
       - PKG_RELEASE=dbg-ubuntu16
       - PROXYSQL_BUILD_TYPE=debug
+      - PROXYSQL_BUILD_ARCH=amd64
     command:
       - /opt/entrypoint/entrypoint.bash
   ubuntu18_build:
@@ -422,6 +446,7 @@ services:
       - CURVER
       - PKG_RELEASE=ubuntu18
       - PROXYSQL_BUILD_TYPE=clickhouse
+      - PROXYSQL_BUILD_ARCH=amd64
     command:
       - /opt/entrypoint/entrypoint.bash
   ubuntu18_arm64_build:
@@ -451,6 +476,7 @@ services:
       - CURVER
       - PKG_RELEASE=dbg-ubuntu18
       - PROXYSQL_BUILD_TYPE=debug
+      - PROXYSQL_BUILD_ARCH=amd64
     command:
       - /opt/entrypoint/entrypoint.bash
   ubuntu20_build:
@@ -465,6 +491,7 @@ services:
       - CURVER
       - PKG_RELEASE=ubuntu20
       - PROXYSQL_BUILD_TYPE=clickhouse
+      - PROXYSQL_BUILD_ARCH=amd64
     command:
       - /opt/entrypoint/entrypoint.bash
   ubuntu20_arm64_build:
@@ -494,5 +521,6 @@ services:
       - CURVER
       - PKG_RELEASE=dbg-ubuntu20
       - PROXYSQL_BUILD_TYPE=debug
+      - PROXYSQL_BUILD_ARCH=amd64
     command:
       - /opt/entrypoint/entrypoint.bash
diff --git a/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash b/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash
index 0491abe3d2..57920d9cac 100755
--- a/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash
+++ b/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash
@@ -3,11 +3,8 @@
 set -eu
 
 
-if [[ "$PROXYSQL_BUILD_ARCH" == *"arm64" ]]; then
-    ARCH="arm64"
-else    
-    ARCH="amd64"
-fi      
+ARCH=$PROXYSQL_BUILD_ARCH
+
 echo "==> $ARCH architecture detected for package"
 
 # Dirty patch to ensure OS deps are installed:
diff --git a/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash b/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash
index 3c37a32cc1..8f4f9b358a 100755
--- a/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash
+++ b/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash
@@ -4,11 +4,7 @@ set -eu
 echo "==> Build environment:"
 env
 
-if [[ "$PROXYSQL_BUILD_ARCH" == *"arm64" ]]; then
-    ARCH="aarch64"
-else    
-    ARCH="x86_64"
-fi
+ARCH=$PROXYSQL_BUILD_ARCH
 echo "==> $ARCH architecture detected for package"
 
 echo "==> Dirty patching to ensure OS deps are installed"
diff --git a/docker/images/proxysql/rhel-compliant/rhel7/entrypoint/entrypoint.bash b/docker/images/proxysql/rhel-compliant/rhel7/entrypoint/entrypoint.bash
index 094f450af1..ff5f15b8fb 100755
--- a/docker/images/proxysql/rhel-compliant/rhel7/entrypoint/entrypoint.bash
+++ b/docker/images/proxysql/rhel-compliant/rhel7/entrypoint/entrypoint.bash
@@ -7,11 +7,7 @@ set -eu
 echo "==> Build environment:"
 env
 
-if [[ "$PROXYSQL_BUILD_ARCH" == *"arm64" ]]; then
-    ARCH="aarch64"
-else
-    ARCH="x86_64"
-fi
+ARCH=$PROXYSQL_BUILD_ARCH
 echo "==> $ARCH architecture detected for package"
 
 echo "==> Dirty patching to ensure OS deps are installed"