diff --git a/CHANGELOG.md b/CHANGELOG.md index 4633605..3bf3f86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 3.9.5 2023-06-13 + + ### Changed + - Start building Influx DB v1 manually due to being removed from Alpine repositories + + ## 3.9.4 2023-06-13 ### Added diff --git a/Dockerfile b/Dockerfile index c64fb2f..503c139 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,8 @@ FROM docker.io/tiredofit/${DISTRO}:${DISTRO_VARIANT} LABEL maintainer="Dave Conroy (github.com/tiredofit)" ### Set Environment Variables -ENV INFLUX2_VERSION=2.4.0 \ +ENV INFLUX_VERSION=1.8.0 \ + INFLUX2_VERSION=2.4.0 \ MSSQL_VERSION=18.0.1.1-1 \ CONTAINER_ENABLE_MESSAGING=FALSE \ CONTAINER_ENABLE_MONITORING=TRUE \ @@ -22,6 +23,7 @@ RUN source /assets/functions/00-container && \ build-base \ bzip2-dev \ git \ + go \ libarchive-dev \ openssl-dev \ libffi-dev \ @@ -33,7 +35,6 @@ RUN source /assets/functions/00-container && \ package install .db-backup-run-deps \ aws-cli \ bzip2 \ - influxdb \ libarchive \ mariadb-client \ mariadb-connector-c \ @@ -60,7 +61,9 @@ RUN source /assets/functions/00-container && \ \ 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; \ 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 ; \ - \ + clone_git_repo https://github.com/influxdata/influxdb "${INFLUX_VERSION}" && \ + go build -o /usr/sbin/influxd ./cmd/influxd && \ + strip /usr/sbin/influxd && \ mkdir -p /usr/src/pbzip2 && \ 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 && \ cd /usr/src/pbzip2 && \ @@ -85,6 +88,7 @@ RUN source /assets/functions/00-container && \ /*.apk \ /etc/logrotate.d/* \ /root/.cache \ + /root/go \ /tmp/* \ /usr/src/* diff --git a/examples/mysql/docker-compose.yml b/examples/mysql/docker-compose.yml index f65b18b..f306aae 100644 --- a/examples/mysql/docker-compose.yml +++ b/examples/mysql/docker-compose.yml @@ -31,6 +31,8 @@ services: - ./backups:/backup #- ./post-script.sh:/assets/custom-scripts/post-script.sh environment: + - TIMEZONE=America/Vancouver + - CONTAINER_ENABLE_MONITORING=FALSE # - DEBUG_MODE=TRUE - DB_TYPE=mariadb - DB_HOST=example-db-host @@ -43,7 +45,7 @@ services: - CHECKSUM=SHA1 - COMPRESSION=GZ - SPLIT_DB=FALSE - - CONTAINER_ENABLE_MONITORING=FALSE + restart: always networks: - example-db-network