Skip to content

Commit

Permalink
Merge pull request #630 from influxdata/BNP_fix_install_paths
Browse files Browse the repository at this point in the history 
chore: fix installation paths for multiple docker containers
  • Loading branch information
@bnpfeife
bnpfeife authored Aug 16, 2022
2 parents 7439923 + 4bb98c4 commit 08d2fa6
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 23 deletions.
4 changes: 2 additions & 2 deletions influxdb/1.10/data/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ RUN set -ex && \
mkdir -p /usr/src && \
tar -C /usr/src -xzf influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \
rm -f /usr/src/influxdb-*/influxdb.conf && \
chmod +x /usr/src/influxdb-*/* && \
cp -a /usr/src/influxdb-*/* /usr/bin/ && \
chmod +x /usr/src/influxdb-*/usr/bin/* && \
cp -a /usr/src/influxdb-*/usr/bin/. /usr/bin/ && \
gpgconf --kill all && \
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
apk del .build-deps
Expand Down
4 changes: 2 additions & 2 deletions influxdb/1.10/meta/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ RUN set -ex && \
mkdir -p /usr/src && \
tar -C /usr/src -xzf influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \
rm -f /usr/src/influxdb-*/influxdb-meta.conf && \
chmod +x /usr/src/influxdb-*/* && \
cp -a /usr/src/influxdb-*/* /usr/bin/ && \
chmod +x /usr/src/influxdb-*/usr/bin/* && \
cp -a /usr/src/influxdb-*/usr/bin/. /usr/bin/ && \
gpgconf --kill all && \
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
apk del .build-deps
Expand Down
14 changes: 11 additions & 3 deletions influxdb/1.7/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,17 @@ RUN set -ex && \
gpg --batch --verify influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
mkdir -p /usr/src && \
tar -C /usr/src -xzf influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
rm -f /usr/src/influxdb-*/influxdb.conf && \
chmod +x /usr/src/influxdb-*/* && \
cp -a /usr/src/influxdb-*/* /usr/bin/ && \
chmod +x /usr/src/influxdb-*/influx \
/usr/src/influxdb-*/influx_inspect \
/usr/src/influxdb-*/influx_stress \
/usr/src/influxdb-*/influx_tsm \
/usr/src/influxdb-*/influxd &&\
cp -a /usr/src/influxdb-*/influx \
/usr/src/influxdb-*/influx_inspect \
/usr/src/influxdb-*/influx_stress \
/usr/src/influxdb-*/influx_tsm \
/usr/src/influxdb-*/influxd \
/usr/bin/ &&\
gpgconf --kill all && \
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
apk del .build-deps
Expand Down
12 changes: 9 additions & 3 deletions influxdb/1.8/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,15 @@ RUN set -ex && \
gpg --batch --verify influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
mkdir -p /usr/src && \
tar -C /usr/src -xzf influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
rm -f /usr/src/influxdb-*/influxdb.conf && \
chmod +x /usr/src/influxdb-*/* && \
cp -a /usr/src/influxdb-*/* /usr/bin/ && \
chmod +x /usr/src/influxdb-*/influx \
/usr/src/influxdb-*/influx_inspect \
/usr/src/influxdb-*/influx_stress \
/usr/src/influxdb-*/influxd &&\
mv /usr/src/influxdb-*/influx \
/usr/src/influxdb-*/influx_inspect \
/usr/src/influxdb-*/influx_stress \
/usr/src/influxdb-*/influxd \
/usr/bin/ &&\
gpgconf --kill all && \
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
apk del .build-deps
Expand Down
2 changes: 1 addition & 1 deletion influxdb/1.9/data/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ RUN set -ex && \
tar -C /usr/src -xzf influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \
rm -f /usr/src/influxdb-*/etc/influxdb/influxdb.conf && \
chmod +x /usr/src/influxdb-*/usr/bin/* && \
cp -a /usr/src/influxdb-*/usr/bin/* /usr/bin/ && \
cp -a /usr/src/influxdb-*/usr/bin/. /usr/bin/ && \
gpgconf --kill all && \
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
apk del .build-deps
Expand Down
2 changes: 1 addition & 1 deletion influxdb/1.9/meta/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ RUN set -ex && \
tar -C /usr/src -xzf influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \
rm -f /usr/src/influxdb-*/etc/influxdb/influxdb-meta.conf && \
chmod +x /usr/src/influxdb-*/usr/bin/* && \
cp -a /usr/src/influxdb-*/usr/bin/* /usr/bin/ && \
cp -a /usr/src/influxdb-*/usr/bin/. /usr/bin/ && \
gpgconf --kill all && \
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
apk del .build-deps
Expand Down
23 changes: 12 additions & 11 deletions influxdb/2.0/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ RUN groupadd -r influxdb --gid=1000 && \
# https://github.com/tianon/gosu/releases
ENV GOSU_VER 1.12
RUN set -eux; \
dpkgArch="$(dpkg --print-architecture)" && \
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch" && \
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch.asc" && \
export GNUPGHOME="$(mktemp -d)" && \
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
gpgconf --kill all && \
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \
chmod +x /usr/local/bin/gosu && \
gosu --version && \
gosu nobody true
dpkgArch="$(dpkg --print-architecture)" && \
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch" && \
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch.asc" && \
export GNUPGHOME="$(mktemp -d)" && \
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
gpgconf --kill all && \
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \
chmod +x /usr/local/bin/gosu && \
gosu --version && \
gosu nobody true

ENV INFLUXDB_VERSION 2.0.9
RUN set -eux && \
Expand All @@ -35,6 +35,7 @@ RUN set -eux && \
echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
gpgconf --kill all && \
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influx* /usr/local/bin/ && \
rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \
Expand Down
1 change: 1 addition & 0 deletions influxdb/2.0/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ RUN set -eux && \
echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
gpgconf --kill all && \
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influx* /usr/local/bin/ && \
rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \
Expand Down

0 comments on commit 08d2fa6

Please sign in to comment.