Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: implement general fixes #643

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

chore: implement general fixes #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f6be170
chore: upgrade images from "stretch" to "bullseye"
bnpfeife Sep 1, 2022
8e61abf
chore: upgrade images from "buster" to "bullseye"
bnpfeife Sep 1, 2022
fdc01ed
chore: fixup gnupg key fetching logic (influxdb)
bnpfeife Aug 24, 2022
263e1ce
chore: fixup gnupg key fetching logic (chronograf)
bnpfeife Aug 24, 2022
2ad6838
chore: fixup gnupg key fetching logic (kapacitor)
bnpfeife Aug 24, 2022
768932c
chore: fixup gnupg key fetching logic (telegraf)
bnpfeife Aug 24, 2022
e22b9e1
chore: only try gpg key-recv once
bnpfeife Sep 1, 2022
e17b3b5
chore: upgrade alpine to "latest"
bnpfeife Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions chronograf/1.10/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
FROM debian:bullseye-slim

RUN set -ex && \
mkdir ~/.gnupg; \
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
apt-get update && apt-get install -y gnupg ca-certificates dirmngr --no-install-recommends && \
rm -rf /var/lib/apt/lists/* && \
for key in \
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
do \
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
done
RUN apt-get update && \
apt-get install \
--yes \
--no-install-recommends \
ca-certificates \
curl \
gnupg && \
rm -rf /var/lib/apt/lists

RUN gpg --yes --batch \
--keyserver hkps://keyserver.ubuntu.com:443 \
--recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5

ENV CHRONOGRAF_VERSION 1.10.0
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
Expand All @@ -21,14 +23,11 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
*) echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
esac && \
set -x && \
apt-get update && apt-get install -y ca-certificates curl --no-install-recommends && \
rm -rf /var/lib/apt/lists/* && \
curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc" && \
curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb" && \
gpg --batch --verify chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \
dpkg -i chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \
rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb* && \
apt-get purge -y --auto-remove $buildDeps
rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb*

COPY LICENSE /usr/share/chronograf/LICENSE
COPY agpl-3.0.md /usr/share/chronograf/agpl-3.0.md
Expand Down
20 changes: 8 additions & 12 deletions chronograf/1.10/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
FROM alpine:3.14
FROM alpine:latest

RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
RUN apk add --no-cache ca-certificates && \
RUN apk add --no-cache ca-certificates gnupg && \
update-ca-certificates

RUN gpg --yes --batch \
--keyserver hkps://keyserver.ubuntu.com:443 \
--recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5

ENV CHRONOGRAF_VERSION 1.10.0

RUN set -ex && \
mkdir ~/.gnupg; \
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
apk add --no-cache --virtual .build-deps wget gnupg tar && \
for key in \
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
do \
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
done && \
apk add --no-cache --virtual .build-deps wget tar && \
wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc && \
wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
gpg --batch --verify chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
Expand All @@ -23,8 +20,7 @@ RUN set -ex && \
rm -f /usr/src/chronograf-*/chronograf.conf && \
chmod +x /usr/src/chronograf-*/* && \
cp -a /usr/src/chronograf-*/* /usr/bin/ && \
gpgconf --kill all && \
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
rm -rf *.tar.gz* /usr/src && \
apk del .build-deps

COPY LICENSE /usr/share/chronograf/LICENSE
Expand Down
27 changes: 13 additions & 14 deletions chronograf/1.6/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
FROM debian:bullseye-slim

RUN set -ex && \
mkdir ~/.gnupg; \
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
apt-get update && apt-get install -y gnupg ca-certificates dirmngr --no-install-recommends && \
rm -rf /var/lib/apt/lists/* && \
for key in \
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
do \
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
done
RUN apt-get update && \
apt-get install \
--yes \
--no-install-recommends \
ca-certificates \
curl \
gnupg && \
rm -rf /var/lib/apt/lists

RUN gpg --yes --batch \
--keyserver hkps://keyserver.ubuntu.com:443 \
--recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5

ENV CHRONOGRAF_VERSION 1.6.2
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
Expand All @@ -21,14 +23,11 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
*) echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
esac && \
set -x && \
apt-get update && apt-get install -y ca-certificates curl --no-install-recommends && \
rm -rf /var/lib/apt/lists/* && \
curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc" && \
curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb" && \
gpg --batch --verify chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \
dpkg -i chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \
rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb* && \
apt-get purge -y --auto-remove $buildDeps
rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb*

COPY LICENSE /usr/share/chronograf/LICENSE
COPY agpl-3.0.md /usr/share/chronograf/agpl-3.0.md
Expand Down
20 changes: 8 additions & 12 deletions chronograf/1.6/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
FROM alpine:3.14
FROM alpine:latest

RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
RUN apk add --no-cache ca-certificates && \
RUN apk add --no-cache ca-certificates gnupg && \
update-ca-certificates

RUN gpg --yes --batch \
--keyserver hkps://keyserver.ubuntu.com:443 \
--recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5

ENV CHRONOGRAF_VERSION 1.6.2

RUN set -ex && \
mkdir ~/.gnupg; \
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
apk add --no-cache --virtual .build-deps wget gnupg tar && \
for key in \
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
do \
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
done && \
apk add --no-cache --virtual .build-deps wget tar && \
wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc && \
wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
gpg --batch --verify chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
Expand All @@ -23,8 +20,7 @@ RUN set -ex && \
rm -f /usr/src/chronograf-*/chronograf.conf && \
chmod +x /usr/src/chronograf-*/* && \
cp -a /usr/src/chronograf-*/* /usr/bin/ && \
gpgconf --kill all && \
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
rm -rf *.tar.gz* /usr/src && \
apk del .build-deps

COPY LICENSE /usr/share/chronograf/LICENSE
Expand Down
25 changes: 13 additions & 12 deletions chronograf/1.7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
FROM debian:bullseye-slim

RUN set -ex && \
mkdir ~/.gnupg; \
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
apt-get update && apt-get install -y gnupg dirmngr --no-install-recommends && \
rm -rf /var/lib/apt/lists/* && \
for key in \
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
do \
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
done
RUN apt-get update && \
apt-get install \
--yes \
--no-install-recommends \
ca-certificates \
curl \
gnupg && \
rm -rf /var/lib/apt/lists

RUN gpg --yes --batch \
--keyserver hkps://keyserver.ubuntu.com:443 \
--recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5

ENV CHRONOGRAF_VERSION 1.7.17
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
Expand All @@ -27,8 +29,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb" && \
gpg --batch --verify chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \
dpkg -i chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \
rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb* && \
apt-get purge -y --auto-remove $buildDeps
rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb*

COPY LICENSE /usr/share/chronograf/LICENSE
COPY agpl-3.0.md /usr/share/chronograf/agpl-3.0.md
Expand Down
21 changes: 8 additions & 13 deletions chronograf/1.7/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
FROM alpine:3.14
FROM alpine:latest

RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
RUN apk add --no-cache ca-certificates && \
RUN apk add --no-cache ca-certificates gnupg && \
update-ca-certificates

ENV CHRONOGRAF_VERSION 1.7.17
RUN gpg --yes --batch \
--keyserver hkps://keyserver.ubuntu.com:443 \
--recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5

ENV CHRONOGRAF_VERSION 1.7.17
RUN set -ex && \
mkdir ~/.gnupg; \
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
apk add --no-cache --virtual .build-deps wget gnupg tar && \
for key in \
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
do \
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
done && \
apk add --no-cache --virtual .build-deps wget tar && \
wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc && \
wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
gpg --batch --verify chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
Expand All @@ -23,8 +19,7 @@ RUN set -ex && \
rm -f /usr/src/chronograf-*/chronograf.conf && \
chmod +x /usr/src/chronograf-*/* && \
cp -a /usr/src/chronograf-*/* /usr/bin/ && \
gpgconf --kill all && \
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
rm -rf *.tar.gz* /usr/src && \
apk del .build-deps

COPY LICENSE /usr/share/chronograf/LICENSE
Expand Down
27 changes: 13 additions & 14 deletions chronograf/1.8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
FROM debian:bullseye-slim

RUN set -ex && \
mkdir ~/.gnupg; \
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
apt-get update && apt-get install -y gnupg ca-certificates dirmngr --no-install-recommends && \
rm -rf /var/lib/apt/lists/* && \
for key in \
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
do \
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
done
RUN apt-get update && \
apt-get install \
--yes \
--no-install-recommends \
ca-certificates \
curl \
gnupg && \
rm -rf /var/lib/apt/lists

RUN gpg --yes --batch \
--keyserver hkps://keyserver.ubuntu.com:443 \
--recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5

ENV CHRONOGRAF_VERSION 1.8.10
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
Expand All @@ -21,14 +23,11 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
*) echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
esac && \
set -x && \
apt-get update && apt-get install -y ca-certificates curl --no-install-recommends && \
rm -rf /var/lib/apt/lists/* && \
curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc" && \
curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb" && \
gpg --batch --verify chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \
dpkg -i chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \
rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb* && \
apt-get purge -y --auto-remove $buildDeps
rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb*

COPY LICENSE /usr/share/chronograf/LICENSE
COPY agpl-3.0.md /usr/share/chronograf/agpl-3.0.md
Expand Down
20 changes: 8 additions & 12 deletions chronograf/1.8/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
FROM alpine:3.14
FROM alpine:latest

RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
RUN apk add --no-cache ca-certificates && \
RUN apk add --no-cache ca-certificates gnupg && \
update-ca-certificates

RUN gpg --yes --batch \
--keyserver hkps://keyserver.ubuntu.com:443 \
--recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5

ENV CHRONOGRAF_VERSION 1.8.10

RUN set -ex && \
mkdir ~/.gnupg; \
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
apk add --no-cache --virtual .build-deps wget gnupg tar && \
for key in \
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
do \
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
done && \
apk add --no-cache --virtual .build-deps wget tar && \
wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc && \
wget --no-verbose https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
gpg --batch --verify chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
Expand All @@ -23,8 +20,7 @@ RUN set -ex && \
rm -f /usr/src/chronograf-*/chronograf.conf && \
chmod +x /usr/src/chronograf-*/* && \
cp -a /usr/src/chronograf-*/* /usr/bin/ && \
gpgconf --kill all && \
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
rm -rf *.tar.gz* /usr/src && \
apk del .build-deps

COPY LICENSE /usr/share/chronograf/LICENSE
Expand Down
27 changes: 13 additions & 14 deletions chronograf/1.9/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
FROM debian:bullseye-slim

RUN set -ex && \
mkdir ~/.gnupg; \
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
apt-get update && apt-get install -y gnupg ca-certificates dirmngr --no-install-recommends && \
rm -rf /var/lib/apt/lists/* && \
for key in \
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
do \
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
done
RUN apt-get update && \
apt-get install \
--yes \
--no-install-recommends \
ca-certificates \
curl \
gnupg && \
rm -rf /var/lib/apt/lists

RUN gpg --yes --batch \
--keyserver hkps://keyserver.ubuntu.com:443 \
--recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5

ENV CHRONOGRAF_VERSION 1.9.4
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
Expand All @@ -21,14 +23,11 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
*) echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
esac && \
set -x && \
apt-get update && apt-get install -y ca-certificates curl --no-install-recommends && \
rm -rf /var/lib/apt/lists/* && \
curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc" && \
curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb" && \
gpg --batch --verify chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \
dpkg -i chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \
rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb* && \
apt-get purge -y --auto-remove $buildDeps
rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb*

COPY LICENSE /usr/share/chronograf/LICENSE
COPY agpl-3.0.md /usr/share/chronograf/agpl-3.0.md
Expand Down
Loading