@@ -5,7 +5,8 @@ FROM docker.io/tiredofit/${DISTRO}:${DISTRO_VARIANT}
55LABEL maintainer="Dave Conroy (github.com/tiredofit)"
66
77# ## Set Environment Variables
8- ENV INFLUX2_VERSION=2.4.0 \
8+ ENV INFLUX_VERSION=1.8.0 \
9+ INFLUX2_VERSION=2.4.0 \
910 MSSQL_VERSION=18.0.1.1-1 \
1011 CONTAINER_ENABLE_MESSAGING=FALSE \
1112 CONTAINER_ENABLE_MONITORING=TRUE \
@@ -22,6 +23,7 @@ RUN source /assets/functions/00-container && \
2223 build-base \
2324 bzip2-dev \
2425 git \
26+ go \
2527 libarchive-dev \
2628 openssl-dev \
2729 libffi-dev \
@@ -33,7 +35,6 @@ RUN source /assets/functions/00-container && \
3335 package install .db-backup-run-deps \
3436 aws-cli \
3537 bzip2 \
36- influxdb \
3738 libarchive \
3839 mariadb-client \
3940 mariadb-connector-c \
@@ -60,7 +61,9 @@ RUN source /assets/functions/00-container && \
6061 \
6162 if [ $mssql = "true" ] ; then curl -O https://download.microsoft.com/download/b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486/msodbcsql18_${MSSQL_VERSION}_amd64.apk ; curl -O https://download.microsoft.com/download/b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486/mssql-tools18_${MSSQL_VERSION}_amd64.apk ; echo y | apk add --allow-untrusted msodbcsql18_${MSSQL_VERSION}_amd64.apk mssql-tools18_${MSSQL_VERSION}_amd64.apk ; else echo >&2 "Detected non x86_64 build variant, skipping MSSQL installation" ; fi; \
6263 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 ; \
63- \
64+ clone_git_repo https://github.com/influxdata/influxdb "${INFLUX_VERSION}" && \
65+ go build -o /usr/sbin/influxd ./cmd/influxd && \
66+ strip /usr/sbin/influxd && \
6467 mkdir -p /usr/src/pbzip2 && \
6568 curl -sSL https://launchpad.net/pbzip2/1.1/1.1.13/+download/pbzip2-1.1.13.tar.gz | tar xvfz - --strip=1 -C /usr/src/pbzip2 && \
6669 cd /usr/src/pbzip2 && \
@@ -85,6 +88,7 @@ RUN source /assets/functions/00-container && \
8588 /*.apk \
8689 /etc/logrotate.d/* \
8790 /root/.cache \
91+ /root/go \
8892 /tmp/* \
8993 /usr/src/*
9094
0 commit comments