From 740bbf3f55e178c4658c9f4bc78665e8a575e9e8 Mon Sep 17 00:00:00 2001 From: Sergey Nikolaev Date: Tue, 27 Feb 2024 13:32:19 +0700 Subject: [PATCH] Fixed Dockerfile and entrypoint so they handle mcl.url right --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a53173b..c8759bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -79,7 +79,8 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ] ; then export ARCH="arm"; else expo && 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-get -y update \ - && echo $(apt-get -y download --print-uris manticore-columnar-lib manticore-galera | cut -d" " -f1 | cut -d "'" -f 2) > /mcl.url \ + && echo $(apt-get -y download --print-uris manticore-columnar-lib | cut -d" " -f1 | cut -d "'" -f 2) > /mcl.url \ + && echo $(apt-get -y download --print-uris manticore-galera | cut -d" " -f1 | cut -d "'" -f 2) > /galera.url \ && echo $(apt-get -y download --print-uris manticore-executor | cut -d" " -f1 | cut -d "'" -f 2) > /extra.url ;\ elif [ ! -z "$DAEMON_URL" ]; then \ echo "2nd step of building release image for linux/${ARCH}64 architecture" \ @@ -88,6 +89,7 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ] ; then export ARCH="arm"; else expo && wget -q $(echo $DAEMON_URL | sed "s/_ARCH_/$ARCH/g") \ && apt-get -y install ./manticore*deb \ && echo $MCL_URL | sed "s/_ARCH_/$ARCH/g" > /mcl.url \ + && echo $GALERA_URL | sed "s/_ARCH_/$ARCH/g" > /galera.url \ && echo $EXTRA_URL | sed "s/_ARCH_/$ARCH/g" > /extra.url \ && rm *.deb ; \ fi