From 3e666ef655ee95870fcfe6e378b6c7323418e10e Mon Sep 17 00:00:00 2001 From: Dave Conroy Date: Fri, 3 Nov 2023 15:02:36 -0700 Subject: [PATCH] Add coreutils to run-deps --- Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 79aaa10..19b6b42 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,8 @@ FROM docker.io/tiredofit/${DISTRO}:${DISTRO_VARIANT} LABEL maintainer="Dave Conroy (github.com/tiredofit)" ### Set Environment Variables -ENV INFLUX_VERSION=1.8.0 \ - INFLUX2_VERSION=2.4.0 \ +ENV INFLUX1_CLIENT_VERSION=1.8.0 \ + INFLUX2_CLIENT_VERSION=2.4.0 \ MSODBC_VERSION=18.3.2.1-1 \ MSSQL_VERSION=18.3.1.1-1 \ AWS_CLI_VERSION=1.25.97 \ @@ -40,6 +40,7 @@ RUN source /assets/functions/00-container && \ \ package install .db-backup-run-deps \ bzip2 \ + coreutils \ groff \ libarchive \ mariadb-client \ @@ -75,10 +76,10 @@ RUN source /assets/functions/00-container && \ esac; \ \ if [ $mssql = "true" ] ; then curl -O https://download.microsoft.com/download/3/5/5/355d7943-a338-41a7-858d-53b259ea33f5/msodbcsql18_${MSODBC_VERSION}_${mssql_arch}.apk ; curl -O https://download.microsoft.com/download/3/5/5/355d7943-a338-41a7-858d-53b259ea33f5/mssql-tools18_${MSSQL_VERSION}_${mssql_arch}.apk ; ls -l ; echo y | apk add --allow-untrusted msodbcsql18_${MSODBC_VERSION}_${mssql_arch}.apk mssql-tools18_${MSSQL_VERSION}_${mssql_arch}.apk ; else echo >&2 "Detected non x86_64 or ARM64 build variant, skipping MSSQL installation" ; fi; \ - if [ $influx2 = "true" ] ; then curl -sSL https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX2_VERSION}-linux-${influx_arch}.tar.gz | tar xvfz - --strip=1 -C /usr/src/ ; chmod +x /usr/src/influx ; mv /usr/src/influx /usr/sbin/ ; else echo >&2 "Unable to build Influx 2 on this system" ; fi ; \ + if [ $influx2 = "true" ] ; then curl -sSL https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX2_CLIENT_VERSION}-linux-${influx_arch}.tar.gz | tar xvfz - --strip=1 -C /usr/src/ ; chmod +x /usr/src/influx ; mv /usr/src/influx /usr/sbin/ ; else echo >&2 "Unable to build Influx 2 on this system" ; fi ; \ clone_git_repo https://github.com/aws/aws-cli "${AWS_CLI_VERSION}" && \ python3 setup.py install --prefix=/usr && \ - clone_git_repo https://github.com/influxdata/influxdb "${INFLUX_VERSION}" && \ + clone_git_repo https://github.com/influxdata/influxdb "${INFLUX1_CLIENT_VERSION}" && \ go build -o /usr/sbin/influxd ./cmd/influxd && \ strip /usr/sbin/influxd && \ mkdir -p /usr/src/pbzip2 && \