Skip to content

Commit 5ce694c

Browse files
author
Nick Vyzas
authored
Fixes amd64 packaging after arm changes (#3124)
1 parent 333f71b commit 5ce694c

File tree

6 files changed

+34
-16
lines changed

6 files changed

+34
-16
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ deps/libconfig/libconfig-1.7.2/
111111
#libmicrohttpd
112112
deps/libmicrohttpd/libmicrohttpd-0.9.55/
113113
deps/libmicrohttpd/libmicrohttpd-0.9.68/
114+
deps/libmicrohttpd/libmicrohttpd
114115

115116
#libhttpserver
116117
deps/libhttpserver/libhttpserver-master_20191121/

‎deps/libmicrohttpd/libmicrohttpd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
libmicrohttpd-0.9.68
1+
libmicrohttpd-0.9.55

‎docker-compose.yml

+28
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ services:
1212
- MAKEOPT
1313
- CURVER
1414
- PKG_RELEASE=centos67
15+
- PROXYSQL_BUILD_ARCH=x86_64
1516
command:
1617
- /opt/entrypoint/entrypoint.bash
1718
centos67_dbg_build:
@@ -27,6 +28,7 @@ services:
2728
- CURVER
2829
- PKG_RELEASE=dbg-centos67
2930
- PROXYSQL_BUILD_TYPE=debug
31+
- PROXYSQL_BUILD_ARCH=x86_64
3032
command:
3133
- /opt/entrypoint/entrypoint.bash
3234
centos7_build:
@@ -41,6 +43,7 @@ services:
4143
- CURVER
4244
- PKG_RELEASE=centos7
4345
- PROXYSQL_BUILD_TYPE=clickhouse
46+
- PROXYSQL_BUILD_ARCH=x86_64
4447
command:
4548
- /opt/entrypoint/entrypoint.bash
4649
centos7_arm64_build:
@@ -70,6 +73,7 @@ services:
7073
- CURVER
7174
- PKG_RELEASE=dbg-centos7
7275
- PROXYSQL_BUILD_TYPE=debug
76+
- PROXYSQL_BUILD_ARCH=x86_64
7377
command:
7478
- /opt/entrypoint/entrypoint.bash
7579
centos8_build:
@@ -84,6 +88,7 @@ services:
8488
- CURVER
8589
- PKG_RELEASE=centos8
8690
- PROXYSQL_BUILD_TYPE=clickhouse
91+
- PROXYSQL_BUILD_ARCH=x86_64
8792
command:
8893
- /opt/entrypoint/entrypoint.bash
8994
centos8_arm64_build:
@@ -113,6 +118,7 @@ services:
113118
- CURVER
114119
- PKG_RELEASE=dbg-centos8
115120
- PROXYSQL_BUILD_TYPE=debug
121+
- PROXYSQL_BUILD_ARCH=x86_64
116122
command:
117123
- /opt/entrypoint/entrypoint.bash
118124
fedora24_build:
@@ -127,6 +133,7 @@ services:
127133
- CURVER
128134
- PKG_RELEASE=fedora24
129135
- PROXYSQL_BUILD_TYPE=clickhouse
136+
- PROXYSQL_BUILD_ARCH=x86_64
130137
command:
131138
- /opt/entrypoint/entrypoint.bash
132139
fedora24_dbg_build:
@@ -141,6 +148,7 @@ services:
141148
- CURVER
142149
- PKG_RELEASE=dbg-fedora24
143150
- PROXYSQL_BUILD_TYPE=debug
151+
- PROXYSQL_BUILD_ARCH=x86_64
144152
command:
145153
- /opt/entrypoint/entrypoint.bash
146154
fedora27_build:
@@ -155,6 +163,7 @@ services:
155163
- CURVER
156164
- PKG_RELEASE=fedora27
157165
- PROXYSQL_BUILD_TYPE=clickhouse
166+
- PROXYSQL_BUILD_ARCH=x86_64
158167
command:
159168
- /opt/entrypoint/entrypoint.bash
160169
fedora27_dbg_build:
@@ -169,6 +178,7 @@ services:
169178
- CURVER
170179
- PKG_RELEASE=dbg-fedora27
171180
- PROXYSQL_BUILD_TYPE=debug
181+
- PROXYSQL_BUILD_ARCH=x86_64
172182
command:
173183
- /opt/entrypoint/entrypoint.bash
174184
fedora28_build:
@@ -183,6 +193,7 @@ services:
183193
- CURVER
184194
- PKG_RELEASE=fedora28
185195
- PROXYSQL_BUILD_TYPE=clickhouse
196+
- PROXYSQL_BUILD_ARCH=x86_64
186197
command:
187198
- /opt/entrypoint/entrypoint.bash
188199
fedora28_dbg_build:
@@ -197,6 +208,7 @@ services:
197208
- CURVER
198209
- PKG_RELEASE=dbg-fedora28
199210
- PROXYSQL_BUILD_TYPE=debug
211+
- PROXYSQL_BUILD_ARCH=x86_64
200212
command:
201213
- /opt/entrypoint/entrypoint.bash
202214
fedora32_arm64_build:
@@ -225,6 +237,7 @@ services:
225237
- MAKEOPT
226238
- CURVER
227239
- PKG_RELEASE=debian8
240+
- PROXYSQL_BUILD_ARCH=amd64
228241
command:
229242
- /opt/entrypoint/entrypoint.bash
230243
debian8_dbg_build:
@@ -239,6 +252,7 @@ services:
239252
- CURVER
240253
- PKG_RELEASE=dbg-debian8
241254
- PROXYSQL_BUILD_TYPE=debug
255+
- PROXYSQL_BUILD_ARCH=amd64
242256
command:
243257
- /opt/entrypoint/entrypoint.bash
244258
debian9_build:
@@ -253,6 +267,7 @@ services:
253267
- CURVER
254268
- PKG_RELEASE=debian9
255269
- PROXYSQL_BUILD_TYPE=clickhouse
270+
- PROXYSQL_BUILD_ARCH=amd64
256271
command:
257272
- /opt/entrypoint/entrypoint.bash
258273
debian9_arm64_build:
@@ -282,6 +297,7 @@ services:
282297
- CURVER
283298
- PKG_RELEASE=dbg-debian9
284299
- PROXYSQL_BUILD_TYPE=debug
300+
- PROXYSQL_BUILD_ARCH=amd64
285301
command:
286302
- /opt/entrypoint/entrypoint.bash
287303
debian9.4_build:
@@ -296,6 +312,7 @@ services:
296312
- CURVER
297313
- PKG_RELEASE=debian9.4
298314
- PROXYSQL_BUILD_TYPE=clickhouse
315+
- PROXYSQL_BUILD_ARCH=amd64
299316
command:
300317
- /opt/entrypoint/entrypoint.bash
301318
debian9.4_dbg_build:
@@ -310,6 +327,7 @@ services:
310327
- CURVER
311328
- PKG_RELEASE=dbg-debian9.4
312329
- PROXYSQL_BUILD_TYPE=debug
330+
- PROXYSQL_BUILD_ARCH=amd64
313331
command:
314332
- /opt/entrypoint/entrypoint.bash
315333
debian10_build:
@@ -324,6 +342,7 @@ services:
324342
- CURVER
325343
- PKG_RELEASE=debian10
326344
- PROXYSQL_BUILD_TYPE=clickhouse
345+
- PROXYSQL_BUILD_ARCH=amd64
327346
command:
328347
- /opt/entrypoint/entrypoint.bash
329348
debian10_arm64_build:
@@ -353,6 +372,7 @@ services:
353372
- CURVER
354373
- PKG_RELEASE=dbg-debian10
355374
- PROXYSQL_BUILD_TYPE=debug
375+
- PROXYSQL_BUILD_ARCH=amd64
356376
command:
357377
- /opt/entrypoint/entrypoint.bash
358378
ubuntu14_build:
@@ -366,6 +386,7 @@ services:
366386
- MAKEOPT
367387
- CURVER
368388
- PKG_RELEASE=ubuntu14
389+
- PROXYSQL_BUILD_ARCH=amd64
369390
command:
370391
- /opt/entrypoint/entrypoint.bash
371392
ubuntu14_dbg_build:
@@ -380,6 +401,7 @@ services:
380401
- CURVER
381402
- PKG_RELEASE=dbg-ubuntu14
382403
- PROXYSQL_BUILD_TYPE=debug
404+
- PROXYSQL_BUILD_ARCH=amd64
383405
command:
384406
- /opt/entrypoint/entrypoint.bash
385407
ubuntu16_build:
@@ -394,6 +416,7 @@ services:
394416
- CURVER
395417
- PKG_RELEASE=ubuntu16
396418
- PROXYSQL_BUILD_TYPE=clickhouse
419+
- PROXYSQL_BUILD_ARCH=amd64
397420
command:
398421
- /opt/entrypoint/entrypoint.bash
399422
ubuntu16_dbg_build:
@@ -408,6 +431,7 @@ services:
408431
- CURVER
409432
- PKG_RELEASE=dbg-ubuntu16
410433
- PROXYSQL_BUILD_TYPE=debug
434+
- PROXYSQL_BUILD_ARCH=amd64
411435
command:
412436
- /opt/entrypoint/entrypoint.bash
413437
ubuntu18_build:
@@ -422,6 +446,7 @@ services:
422446
- CURVER
423447
- PKG_RELEASE=ubuntu18
424448
- PROXYSQL_BUILD_TYPE=clickhouse
449+
- PROXYSQL_BUILD_ARCH=amd64
425450
command:
426451
- /opt/entrypoint/entrypoint.bash
427452
ubuntu18_arm64_build:
@@ -451,6 +476,7 @@ services:
451476
- CURVER
452477
- PKG_RELEASE=dbg-ubuntu18
453478
- PROXYSQL_BUILD_TYPE=debug
479+
- PROXYSQL_BUILD_ARCH=amd64
454480
command:
455481
- /opt/entrypoint/entrypoint.bash
456482
ubuntu20_build:
@@ -465,6 +491,7 @@ services:
465491
- CURVER
466492
- PKG_RELEASE=ubuntu20
467493
- PROXYSQL_BUILD_TYPE=clickhouse
494+
- PROXYSQL_BUILD_ARCH=amd64
468495
command:
469496
- /opt/entrypoint/entrypoint.bash
470497
ubuntu20_arm64_build:
@@ -494,5 +521,6 @@ services:
494521
- CURVER
495522
- PKG_RELEASE=dbg-ubuntu20
496523
- PROXYSQL_BUILD_TYPE=debug
524+
- PROXYSQL_BUILD_ARCH=amd64
497525
command:
498526
- /opt/entrypoint/entrypoint.bash

‎docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash

+2-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@
33
set -eu
44

55

6-
if [[ "$PROXYSQL_BUILD_ARCH" == *"arm64" ]]; then
7-
ARCH="arm64"
8-
else
9-
ARCH="amd64"
10-
fi
6+
ARCH=$PROXYSQL_BUILD_ARCH
7+
118
echo "==> $ARCH architecture detected for package"
129

1310
# Dirty patch to ensure OS deps are installed:

‎docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ set -eu
44
echo "==> Build environment:"
55
env
66

7-
if [[ "$PROXYSQL_BUILD_ARCH" == *"arm64" ]]; then
8-
ARCH="aarch64"
9-
else
10-
ARCH="x86_64"
11-
fi
7+
ARCH=$PROXYSQL_BUILD_ARCH
128
echo "==> $ARCH architecture detected for package"
139

1410
echo "==> Dirty patching to ensure OS deps are installed"

‎docker/images/proxysql/rhel-compliant/rhel7/entrypoint/entrypoint.bash

+1-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@ set -eu
77
echo "==> Build environment:"
88
env
99

10-
if [[ "$PROXYSQL_BUILD_ARCH" == *"arm64" ]]; then
11-
ARCH="aarch64"
12-
else
13-
ARCH="x86_64"
14-
fi
10+
ARCH=$PROXYSQL_BUILD_ARCH
1511
echo "==> $ARCH architecture detected for package"
1612

1713
echo "==> Dirty patching to ensure OS deps are installed"

0 commit comments

Comments
 (0)