From 254ebdc00363c5a6b6ffbd0d541eb9cd94c39b4e Mon Sep 17 00:00:00 2001 From: Sergey Nikolaev Date: Sat, 11 Jan 2025 18:25:35 +0700 Subject: [PATCH 01/12] feat: added manticore-load --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5850092..6e6fd1e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,6 +24,7 @@ https://repo.manticoresearch.com/repository/manticoresearch_jammy/dists/jammy/ma https://repo.manticoresearch.com/repository/manticoresearch_jammy/dists/jammy/main/binary-_ARCH_64/manticore-dev_6.3.8-24112202-d17bd2b6b_all.deb \ https://repo.manticoresearch.com/repository/manticoresearch_jammy/dists/jammy/main/binary-_ARCH_64/manticore-icudata-65l.deb \ https://repo.manticoresearch.com/repository/manticoresearch_jammy/dists/jammy/main/binary-_ARCH_64/manticore-tzdata_1.0.0-240522-a8aa66e_all.deb"} +# TODO: add manticore-load to the next release # If you set EXTRA=1, MCL=1 will automatically be invoked. # We're only providing the executor URL here because the columnar-lib included in the package will be installed via the MCL=1 flag. @@ -78,7 +79,7 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ] ; then export ARCH="arm"; else expo echo "2nd step of building dev image for linux/${ARCH}64 architecture" \ && wget -q https://repo.manticoresearch.com/manticore-dev-repo.noarch.deb \ && dpkg -i manticore-dev-repo.noarch.deb \ - && apt-key adv --fetch-keys 'https://repo.manticoresearch.com/GPG-KEY-manticore' && apt-get -y update && apt-get -y install manticore \ + && apt-key adv --fetch-keys 'https://repo.manticoresearch.com/GPG-KEY-manticore' && apt-get -y update && apt-get -y install manticore manticore-load \ && apt-get -y update \ && echo $(apt-get -y download --print-uris manticore-galera manticore-columnar-lib | cut -d" " -f1 | cut -d "'" -f 2 | sort -r) > /mcl_galera.url \ && echo $(apt-get -y download --print-uris manticore-executor | cut -d" " -f1 | cut -d "'" -f 2) > /extra.url ;\ From e1cd8d173ecf640ba598452ea98ba6f7fa84c021 Mon Sep 17 00:00:00 2001 From: Sergey Nikolaev Date: Sat, 11 Jan 2025 18:49:17 +0700 Subject: [PATCH 02/12] tests: increased timeout for dockerd from 60 to 120 sec --- clt_tests/tests/base/init.recb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clt_tests/tests/base/init.recb b/clt_tests/tests/base/init.recb index e605c03..2e6adf7 100644 --- a/clt_tests/tests/base/init.recb +++ b/clt_tests/tests/base/init.recb @@ -2,7 +2,7 @@ (dockerd > /var/log/dockerd.log 2>&1 &) > /dev/null ––– output ––– ––– input ––– -if timeout 60 grep -qm1 'API listen on /var/run/docker.sock' <(tail -n 0 -f /var/log/dockerd.log); then echo 'Done'; else echo 'Timeout failed'; fi +if timeout 120 grep -qm1 'API listen on /var/run/docker.sock' <(tail -n 0 -f /var/log/dockerd.log); then echo 'Done'; else echo 'Timeout failed'; fi ––– output ––– Done ––– input ––– From 64266afde6b1c59e931009d492eb48c4cfba719e Mon Sep 17 00:00:00 2001 From: Sergey Nikolaev Date: Sat, 11 Jan 2025 19:10:36 +0700 Subject: [PATCH 03/12] fix: reverted timeout for dockerd back to 60, increased -n for tail The hypothesis is that dockerd runs too fast and we don't have a chance to detect the record in the log with "tail -n 0 -f" --- clt_tests/tests/base/init.recb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clt_tests/tests/base/init.recb b/clt_tests/tests/base/init.recb index 2e6adf7..fcb7a55 100644 --- a/clt_tests/tests/base/init.recb +++ b/clt_tests/tests/base/init.recb @@ -2,7 +2,7 @@ (dockerd > /var/log/dockerd.log 2>&1 &) > /dev/null ––– output ––– ––– input ––– -if timeout 120 grep -qm1 'API listen on /var/run/docker.sock' <(tail -n 0 -f /var/log/dockerd.log); then echo 'Done'; else echo 'Timeout failed'; fi +if timeout 60 grep -qm1 'API listen on /var/run/docker.sock' <(tail -n 500 -f /var/log/dockerd.log); then echo 'Done'; else echo 'Timeout failed'; fi ––– output ––– Done ––– input ––– From bb60bdac30915f8ae7dcf9b6dc20f9cb3fd27001 Mon Sep 17 00:00:00 2001 From: Sergey Nikolaev Date: Sat, 11 Jan 2025 19:14:49 +0700 Subject: [PATCH 04/12] debug: added debug to init.recb --- clt_tests/tests/base/init.recb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clt_tests/tests/base/init.recb b/clt_tests/tests/base/init.recb index fcb7a55..cd16f6b 100644 --- a/clt_tests/tests/base/init.recb +++ b/clt_tests/tests/base/init.recb @@ -2,7 +2,7 @@ (dockerd > /var/log/dockerd.log 2>&1 &) > /dev/null ––– output ––– ––– input ––– -if timeout 60 grep -qm1 'API listen on /var/run/docker.sock' <(tail -n 500 -f /var/log/dockerd.log); then echo 'Done'; else echo 'Timeout failed'; fi +if timeout 60 grep -qm1 'API listen on /var/run/docker.sock' <(tail -n 500 -f /var/log/dockerd.log); then echo 'Done'; else echo 'Timeout failed'; cat /var/log/dockerd.log; fi ––– output ––– Done ––– input ––– From 495419bf767a53ada803f9b7613968bad97474ce Mon Sep 17 00:00:00 2001 From: Sergey Nikolaev Date: Sat, 11 Jan 2025 12:25:50 +0000 Subject: [PATCH 05/12] fix: added iptables to testkit Dockerfile. It seems dockerd requires it --- clt_tests/testkit/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clt_tests/testkit/Dockerfile b/clt_tests/testkit/Dockerfile index 2edf0a3..7410320 100644 --- a/clt_tests/testkit/Dockerfile +++ b/clt_tests/testkit/Dockerfile @@ -1,3 +1,3 @@ FROM docker:dind -RUN apk update && apk add bash procps +RUN apk update && apk add bash procps iptables From 5104e9bb36e1a867c30b056b8a929abfb4a88562 Mon Sep 17 00:00:00 2001 From: Sergey Nikolaev Date: Sat, 11 Jan 2025 12:37:11 +0000 Subject: [PATCH 06/12] fix: reverted to older dind image --- clt_tests/testkit/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clt_tests/testkit/Dockerfile b/clt_tests/testkit/Dockerfile index 7410320..dd4f48c 100644 --- a/clt_tests/testkit/Dockerfile +++ b/clt_tests/testkit/Dockerfile @@ -1,3 +1,3 @@ -FROM docker:dind +FROM docker:27.4.0-dind -RUN apk update && apk add bash procps iptables +RUN apk update && apk add bash procps From 7baa6ae7aa8ac984fe7404d3a416b41fc2a39699 Mon Sep 17 00:00:00 2001 From: Sergey Nikolaev Date: Sat, 11 Jan 2025 12:47:34 +0000 Subject: [PATCH 07/12] debug --- clt_tests/tests/base/init.recb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clt_tests/tests/base/init.recb b/clt_tests/tests/base/init.recb index cd16f6b..37495b6 100644 --- a/clt_tests/tests/base/init.recb +++ b/clt_tests/tests/base/init.recb @@ -2,7 +2,7 @@ (dockerd > /var/log/dockerd.log 2>&1 &) > /dev/null ––– output ––– ––– input ––– -if timeout 60 grep -qm1 'API listen on /var/run/docker.sock' <(tail -n 500 -f /var/log/dockerd.log); then echo 'Done'; else echo 'Timeout failed'; cat /var/log/dockerd.log; fi +if timeout 60 grep -qm1 'API listen on /var/run/docker.sock' <(tail -n 500 -f /var/log/dockerd.log); then echo 'Done'; else echo 'Timeout failed'; cat /var/log/dockerd.log; which iptables; fi ––– output ––– Done ––– input ––– From 58816e25728c02695c962f9a08a7af9987c6cdb0 Mon Sep 17 00:00:00 2001 From: Sergey Nikolaev Date: Sat, 11 Jan 2025 12:50:34 +0000 Subject: [PATCH 08/12] debug --- clt_tests/tests/base/init.recb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clt_tests/tests/base/init.recb b/clt_tests/tests/base/init.recb index 37495b6..ccb0d11 100644 --- a/clt_tests/tests/base/init.recb +++ b/clt_tests/tests/base/init.recb @@ -2,7 +2,7 @@ (dockerd > /var/log/dockerd.log 2>&1 &) > /dev/null ––– output ––– ––– input ––– -if timeout 60 grep -qm1 'API listen on /var/run/docker.sock' <(tail -n 500 -f /var/log/dockerd.log); then echo 'Done'; else echo 'Timeout failed'; cat /var/log/dockerd.log; which iptables; fi +if timeout 60 grep -qm1 'API listen on /var/run/docker.sock' <(tail -n 500 -f /var/log/dockerd.log); then echo 'Done'; else echo 'Timeout failed'; cat /var/log/dockerd.log; which iptables; iptables --help; fi ––– output ––– Done ––– input ––– From d087f2e716df925ecd2cb0a79ad653ebd2a1c82c Mon Sep 17 00:00:00 2001 From: Sergey Nikolaev Date: Sat, 11 Jan 2025 12:53:20 +0000 Subject: [PATCH 09/12] debug --- clt_tests/tests/base/init.recb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clt_tests/tests/base/init.recb b/clt_tests/tests/base/init.recb index ccb0d11..a7659ef 100644 --- a/clt_tests/tests/base/init.recb +++ b/clt_tests/tests/base/init.recb @@ -2,7 +2,7 @@ (dockerd > /var/log/dockerd.log 2>&1 &) > /dev/null ––– output ––– ––– input ––– -if timeout 60 grep -qm1 'API listen on /var/run/docker.sock' <(tail -n 500 -f /var/log/dockerd.log); then echo 'Done'; else echo 'Timeout failed'; cat /var/log/dockerd.log; which iptables; iptables --help; fi +if timeout 60 grep -qm1 'API listen on /var/run/docker.sock' <(tail -n 500 -f /var/log/dockerd.log); then echo 'Done'; else echo 'Timeout failed'; cat /var/log/dockerd.log; which iptables; iptables --help; echo "checking in sbin"; /usr/sbin/iptables --help; fi ––– output ––– Done ––– input ––– From e3d198eca94138ba7dd2537dd8f31873d4ec8d4b Mon Sep 17 00:00:00 2001 From: Sergey Nikolaev Date: Sat, 11 Jan 2025 12:57:01 +0000 Subject: [PATCH 10/12] debug --- clt_tests/tests/base/init.recb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/clt_tests/tests/base/init.recb b/clt_tests/tests/base/init.recb index a7659ef..936b49e 100644 --- a/clt_tests/tests/base/init.recb +++ b/clt_tests/tests/base/init.recb @@ -1,3 +1,6 @@ +--- input --- +export PATH=$PATH:/usr/sbin +--- output --- ––– input ––– (dockerd > /var/log/dockerd.log 2>&1 &) > /dev/null ––– output ––– From cc3478609356922b4810996d5dcc093747a63f65 Mon Sep 17 00:00:00 2001 From: Sergey Nikolaev Date: Sat, 11 Jan 2025 13:00:24 +0000 Subject: [PATCH 11/12] debug --- clt_tests/tests/base/init.recb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clt_tests/tests/base/init.recb b/clt_tests/tests/base/init.recb index 936b49e..a363af3 100644 --- a/clt_tests/tests/base/init.recb +++ b/clt_tests/tests/base/init.recb @@ -1,6 +1,6 @@ ---- input --- +––– input ––– export PATH=$PATH:/usr/sbin ---- output --- +––– output ––– ––– input ––– (dockerd > /var/log/dockerd.log 2>&1 &) > /dev/null ––– output ––– From 95c128bebc7309e88d689e61b15eae17241d882a Mon Sep 17 00:00:00 2001 From: Sergey Nikolaev Date: Sat, 11 Jan 2025 13:04:38 +0000 Subject: [PATCH 12/12] debug: removed debug --- clt_tests/testkit/Dockerfile | 2 +- clt_tests/tests/base/init.recb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clt_tests/testkit/Dockerfile b/clt_tests/testkit/Dockerfile index dd4f48c..2edf0a3 100644 --- a/clt_tests/testkit/Dockerfile +++ b/clt_tests/testkit/Dockerfile @@ -1,3 +1,3 @@ -FROM docker:27.4.0-dind +FROM docker:dind RUN apk update && apk add bash procps diff --git a/clt_tests/tests/base/init.recb b/clt_tests/tests/base/init.recb index a363af3..8a2ddc4 100644 --- a/clt_tests/tests/base/init.recb +++ b/clt_tests/tests/base/init.recb @@ -5,7 +5,7 @@ export PATH=$PATH:/usr/sbin (dockerd > /var/log/dockerd.log 2>&1 &) > /dev/null ––– output ––– ––– input ––– -if timeout 60 grep -qm1 'API listen on /var/run/docker.sock' <(tail -n 500 -f /var/log/dockerd.log); then echo 'Done'; else echo 'Timeout failed'; cat /var/log/dockerd.log; which iptables; iptables --help; echo "checking in sbin"; /usr/sbin/iptables --help; fi +if timeout 60 grep -qm1 'API listen on /var/run/docker.sock' <(tail -n 0 -f /var/log/dockerd.log); then echo 'Done'; else echo 'Timeout failed'; fi ––– output ––– Done ––– input –––