Skip to content
This repository was archived by the owner on Dec 17, 2024. It is now read-only.

Commit 3f35855

Browse files
committed
Docker component update: Influx 1.8.4, Grafana 6.7.5, Go 1.15.8
1 parent dd7dd92 commit 3f35855

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ RUN apt-get -q update \
1313
# Influxdb [https://portal.influxdata.com/downloads]
1414
# latest ver.: curl -so- https://api.github.com/repos/influxdata/influxdb/tags | grep -Eo '"v[0-9\.]+"' | grep -Eo '[0-9\.]+' | sort -nr | head -1
1515

16-
RUN wget -q -O grafana.deb https://dl.grafana.com/oss/release/grafana_6.7.4_amd64.deb \
17-
&& wget -q -O - https://dl.influxdata.com/influxdb/releases/influxdb_1.8.3_amd64.deb > influxdb_amd64.deb \
16+
RUN wget -q -O grafana.deb https://dl.grafana.com/oss/release/grafana_6.7.5_amd64.deb \
17+
&& wget -q -O - https://dl.influxdata.com/influxdb/releases/influxdb_1.8.4_amd64.deb > influxdb_amd64.deb \
1818
&& dpkg -i grafana.deb && rm grafana.deb \
1919
&& dpkg -i influxdb_amd64.deb && rm influxdb_amd64.deb \
2020
&& sed -i 's/\# query-log-enabled = true/query-log-enabled = false/' /etc/influxdb/influxdb.conf \
@@ -40,7 +40,7 @@ ENV GIT_TIME=${GIT_TIME}
4040

4141
# Go installation [https://golang.org/dl/]
4242
# Grafana config customizations, Web UI requirements, compilation of the Go gatherer
43-
RUN wget -q -O /tmp/go.tar.gz https://dl.google.com/go/go1.15.6.linux-amd64.tar.gz \
43+
RUN wget -q -O /tmp/go.tar.gz https://dl.google.com/go/go1.15.8.linux-amd64.tar.gz \
4444
&& tar -C /usr/local -xzf /tmp/go.tar.gz \
4545
&& export PATH=$PATH:/usr/local/go/bin \
4646
&& cp /pgwatch2/bootstrap/grafana_custom_config.ini /etc/grafana/grafana.ini \

docker/Dockerfile-daemon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ENV GIT_TIME=${GIT_TIME}
1919
### Install Go and compile the gatherer daemon
2020
###
2121

22-
RUN wget -q -O /tmp/go.tar.gz https://dl.google.com/go/go1.15.6.linux-amd64.tar.gz \
22+
RUN wget -q -O /tmp/go.tar.gz https://dl.google.com/go/go1.15.8.linux-amd64.tar.gz \
2323
&& tar -C /usr/local -xzf /tmp/go.tar.gz \
2424
&& export PATH=$PATH:/usr/local/go/bin \
2525
&& cd /pgwatch2 && bash build_gatherer.sh \

docker/Dockerfile-nonroot

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ RUN pip3 install supervisor \
1919
# Influxdb [https://portal.influxdata.com/downloads]
2020
# latest ver.: curl -so- https://api.github.com/repos/influxdata/influxdb/tags | grep -Eo '"v[0-9\.]+"' | grep -Eo '[0-9\.]+' | sort -nr | head -1
2121

22-
RUN wget -q -O grafana.deb https://dl.grafana.com/oss/release/grafana_6.7.4_amd64.deb \
23-
&& wget -q -O - https://dl.influxdata.com/influxdb/releases/influxdb_1.8.3_amd64.deb > influxdb_amd64.deb \
22+
RUN wget -q -O grafana.deb https://dl.grafana.com/oss/release/grafana_6.7.5_amd64.deb \
23+
&& wget -q -O - https://dl.influxdata.com/influxdb/releases/influxdb_1.8.4_amd64.deb > influxdb_amd64.deb \
2424
&& dpkg -i grafana.deb && rm grafana.deb \
2525
&& mkdir -p /var/run/grafana \
2626
&& chgrp -R 0 /etc/grafana/ /usr/share/grafana /var/lib/grafana /var/log/grafana /var/run/grafana \
@@ -49,7 +49,7 @@ ENV GIT_TIME=${GIT_TIME}
4949

5050
# Go installation [https://golang.org/dl/]
5151
# Grafana config customizations, Web UI requirements, compilation of the Go gatherer
52-
RUN wget -q -O /tmp/go.tar.gz https://dl.google.com/go/go1.15.6.linux-amd64.tar.gz \
52+
RUN wget -q -O /tmp/go.tar.gz https://dl.google.com/go/go1.15.8.linux-amd64.tar.gz \
5353
&& tar -C /usr/local -xzf /tmp/go.tar.gz \
5454
&& export PATH=$PATH:/usr/local/go/bin \
5555
&& cp /pgwatch2/bootstrap/grafana_custom_config.ini /etc/grafana/grafana.ini \

docker/Dockerfile-postgres

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ RUN apt-get -q update && DEBIAN_FRONTEND=noninteractive apt-get install -qy curl
1616
# Influxdb [https://portal.influxdata.com/downloads]
1717
# latest ver.: curl -so- https://api.github.com/repos/influxdata/influxdb/tags | grep -Eo '"v[0-9\.]+"' | grep -Eo '[0-9\.]+' | sort -nr | head -1
1818

19-
RUN wget -q -O grafana.deb https://dl.grafana.com/oss/release/grafana_6.7.4_amd64.deb \
19+
RUN wget -q -O grafana.deb https://dl.grafana.com/oss/release/grafana_6.7.5_amd64.deb \
2020
&& dpkg -i grafana.deb && rm grafana.deb
2121

2222

@@ -32,7 +32,7 @@ ENV GIT_TIME=${GIT_TIME}
3232

3333
# Go installation [https://golang.org/dl/]
3434
# Grafana config customizations, Web UI requirements, compilation of the Go gatherer
35-
RUN wget -q -O /tmp/go.tar.gz https://dl.google.com/go/go1.15.6.linux-amd64.tar.gz \
35+
RUN wget -q -O /tmp/go.tar.gz https://dl.google.com/go/go1.15.8.linux-amd64.tar.gz \
3636
&& tar -C /usr/local -xzf /tmp/go.tar.gz \
3737
&& export PATH=$PATH:/usr/local/go/bin \
3838
&& cp /pgwatch2/bootstrap/grafana_custom_config.ini /etc/grafana/grafana.ini \

0 commit comments

Comments
 (0)