11ARG DISTRO=alpine
2- ARG DISTRO_VARIANT=3.21-7.10.28
2+ ARG DISTRO_VARIANT=3.21-7.10.31
33
44FROM docker.io/tiredofit/${DISTRO}:${DISTRO_VARIANT}
55LABEL maintainer="Dave Conroy (github.com/tiredofit)"
@@ -75,7 +75,7 @@ RUN source /assets/functions/00-container && \
7575 wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb' && \
7676 export LLVM_CONFIG="/usr/lib/llvm19/bin/llvm-config" && \
7777 export CLANG=clang-19 && \
78- ./configure \
78+ ./configure \
7979 --build="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
8080 --prefix=/usr/local \
8181 --with-includes=/usr/local/include \
@@ -84,6 +84,7 @@ RUN source /assets/functions/00-container && \
8484 --with-pgport=5432 \
8585 --disable-rpath \
8686 --enable-integer-datetimes \
87+ --enable-thread-safety \
8788 --enable-tap-tests \
8889 --with-gnu-ld \
8990 --with-icu \
@@ -99,8 +100,8 @@ RUN source /assets/functions/00-container && \
99100 --with-uuid=e2fs \
100101 --with-zstd \
101102 && \
102- make -j "$(nproc)" world && \
103- make install-world && \
103+ make -j "$(nproc)" world-bin && \
104+ make install-world-bin && \
104105 make -j "$(nproc)" -C contrib && \
105106 make -C contrib/ install && \
106107 runDeps="$( \
@@ -183,15 +184,20 @@ RUN source /assets/functions/00-container && \
183184 zstd \
184185 && \
185186 \
187+ echo ""
188+ RUN set -ex && \
189+ source /assets/functions/00-container && \
190+ mkdir -p /opt/microsoft/msodbcsql18/ && \
191+ touch /opt/microsoft/msodbcsql18/ACCEPT_EULA && \
186192 case "$(uname -m)" in \
187193 "x86_64" ) mssql=true ; mssql_arch=amd64; influx2=true ; influx_arch=amd64; ;; \
188194 "arm64" | "aarch64" ) mssql=true ; mssql_arch=arm64; influx2=true ; influx_arch=arm64 ;; \
189195 *) sleep 0.1 ;; \
190196 esac; \
191197 \
192198 if [ "${mssql,,}" = "true" ] ; then \
193- curl -sSLO https://download.microsoft.com/download/9dcab408-e0d4-4571-a81a-5a0951e3445f/msodbcsql18_${MSODBC_VERSION}_${mssql_arch}.apk ; \
194- curl -sSLO https://download.microsoft.com/download/b60bb8b6-d398-4819-9950-2e30cf725fb0/mssql-tools18_${MSSQL_VERSION}_${mssql_arch}.apk ; \
199+ curl -O https://download.microsoft.com/download/9dcab408-e0d4-4571-a81a-5a0951e3445f/msodbcsql18_${MSODBC_VERSION}_${mssql_arch}.apk ; \
200+ curl -O https://download.microsoft.com/download/b60bb8b6-d398-4819-9950-2e30cf725fb0/mssql-tools18_${MSSQL_VERSION}_${mssql_arch}.apk ; \
195201 echo y | apk add --allow-untrusted msodbcsql18_${MSODBC_VERSION}_${mssql_arch}.apk mssql-tools18_${MSSQL_VERSION}_${mssql_arch}.apk ; \
196202 else \
197203 echo >&2 "Detected non x86_64 or ARM64 build variant, skipping MSSQL installation" ; \
0 commit comments