Skip to content

Commit 08d2fa6

Browse files
bnpfeifebnpfeife
authored
Merge pull request #630 from influxdata/BNP_fix_install_paths
chore: fix installation paths for multiple docker containers
2 parents 7439923 + 4bb98c4 commit 08d2fa6

File tree

8 files changed

+39
-23
lines changed

8 files changed

+39
-23
lines changed

‎influxdb/1.10/data/alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ RUN set -ex && \
1818
mkdir -p /usr/src && \
1919
tar -C /usr/src -xzf influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \
2020
rm -f /usr/src/influxdb-*/influxdb.conf && \
21-
chmod +x /usr/src/influxdb-*/* && \
22-
cp -a /usr/src/influxdb-*/* /usr/bin/ && \
21+
chmod +x /usr/src/influxdb-*/usr/bin/* && \
22+
cp -a /usr/src/influxdb-*/usr/bin/. /usr/bin/ && \
2323
gpgconf --kill all && \
2424
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
2525
apk del .build-deps

‎influxdb/1.10/meta/alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ RUN set -ex && \
1818
mkdir -p /usr/src && \
1919
tar -C /usr/src -xzf influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \
2020
rm -f /usr/src/influxdb-*/influxdb-meta.conf && \
21-
chmod +x /usr/src/influxdb-*/* && \
22-
cp -a /usr/src/influxdb-*/* /usr/bin/ && \
21+
chmod +x /usr/src/influxdb-*/usr/bin/* && \
22+
cp -a /usr/src/influxdb-*/usr/bin/. /usr/bin/ && \
2323
gpgconf --kill all && \
2424
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
2525
apk del .build-deps

‎influxdb/1.7/alpine/Dockerfile

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,17 @@ RUN set -ex && \
1919
gpg --batch --verify influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
2020
mkdir -p /usr/src && \
2121
tar -C /usr/src -xzf influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
22-
rm -f /usr/src/influxdb-*/influxdb.conf && \
23-
chmod +x /usr/src/influxdb-*/* && \
24-
cp -a /usr/src/influxdb-*/* /usr/bin/ && \
22+
chmod +x /usr/src/influxdb-*/influx \
23+
/usr/src/influxdb-*/influx_inspect \
24+
/usr/src/influxdb-*/influx_stress \
25+
/usr/src/influxdb-*/influx_tsm \
26+
/usr/src/influxdb-*/influxd &&\
27+
cp -a /usr/src/influxdb-*/influx \
28+
/usr/src/influxdb-*/influx_inspect \
29+
/usr/src/influxdb-*/influx_stress \
30+
/usr/src/influxdb-*/influx_tsm \
31+
/usr/src/influxdb-*/influxd \
32+
/usr/bin/ &&\
2533
gpgconf --kill all && \
2634
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
2735
apk del .build-deps

‎influxdb/1.8/alpine/Dockerfile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,15 @@ RUN set -ex && \
1919
gpg --batch --verify influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
2020
mkdir -p /usr/src && \
2121
tar -C /usr/src -xzf influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
22-
rm -f /usr/src/influxdb-*/influxdb.conf && \
23-
chmod +x /usr/src/influxdb-*/* && \
24-
cp -a /usr/src/influxdb-*/* /usr/bin/ && \
22+
chmod +x /usr/src/influxdb-*/influx \
23+
/usr/src/influxdb-*/influx_inspect \
24+
/usr/src/influxdb-*/influx_stress \
25+
/usr/src/influxdb-*/influxd &&\
26+
mv /usr/src/influxdb-*/influx \
27+
/usr/src/influxdb-*/influx_inspect \
28+
/usr/src/influxdb-*/influx_stress \
29+
/usr/src/influxdb-*/influxd \
30+
/usr/bin/ &&\
2531
gpgconf --kill all && \
2632
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
2733
apk del .build-deps

‎influxdb/1.9/data/alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN set -ex && \
1919
tar -C /usr/src -xzf influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \
2020
rm -f /usr/src/influxdb-*/etc/influxdb/influxdb.conf && \
2121
chmod +x /usr/src/influxdb-*/usr/bin/* && \
22-
cp -a /usr/src/influxdb-*/usr/bin/* /usr/bin/ && \
22+
cp -a /usr/src/influxdb-*/usr/bin/. /usr/bin/ && \
2323
gpgconf --kill all && \
2424
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
2525
apk del .build-deps

‎influxdb/1.9/meta/alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN set -ex && \
1919
tar -C /usr/src -xzf influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \
2020
rm -f /usr/src/influxdb-*/etc/influxdb/influxdb-meta.conf && \
2121
chmod +x /usr/src/influxdb-*/usr/bin/* && \
22-
cp -a /usr/src/influxdb-*/usr/bin/* /usr/bin/ && \
22+
cp -a /usr/src/influxdb-*/usr/bin/. /usr/bin/ && \
2323
gpgconf --kill all && \
2424
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
2525
apk del .build-deps

‎influxdb/2.0/Dockerfile

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ RUN groupadd -r influxdb --gid=1000 && \
99
# https://github.com/tianon/gosu/releases
1010
ENV GOSU_VER 1.12
1111
RUN set -eux; \
12-
dpkgArch="$(dpkg --print-architecture)" && \
13-
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch" && \
14-
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch.asc" && \
15-
export GNUPGHOME="$(mktemp -d)" && \
16-
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
17-
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
18-
gpgconf --kill all && \
19-
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \
20-
chmod +x /usr/local/bin/gosu && \
21-
gosu --version && \
22-
gosu nobody true
12+
dpkgArch="$(dpkg --print-architecture)" && \
13+
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch" && \
14+
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch.asc" && \
15+
export GNUPGHOME="$(mktemp -d)" && \
16+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
17+
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
18+
gpgconf --kill all && \
19+
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \
20+
chmod +x /usr/local/bin/gosu && \
21+
gosu --version && \
22+
gosu nobody true
2323

2424
ENV INFLUXDB_VERSION 2.0.9
2525
RUN set -eux && \
@@ -35,6 +35,7 @@ RUN set -eux && \
3535
echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
3636
gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
3737
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
38+
gpgconf --kill all && \
3839
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
3940
cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influx* /usr/local/bin/ && \
4041
rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \

‎influxdb/2.0/alpine/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ RUN set -eux && \
2525
echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
2626
gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
2727
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
28+
gpgconf --kill all && \
2829
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
2930
cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influx* /usr/local/bin/ && \
3031
rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \

0 commit comments

Comments
 (0)