Skip to content
Snippets Groups Projects
Commit 60a9843b authored by Johannes Jordan's avatar Johannes Jordan
Browse files

Remove all intermediate files in same layers 

- Remove untarred files that were previously missed by glob
- Remove files in layer they originate from

This is in line with the approach in telegraf's Dockerfiles
parent d0e95946
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
influxdb/2.3/Dockerfile
+ 3
− 3
View file @ 60a9843b
...@@ -37,6 +37,7 @@ RUN set -eux && \ ...@@ -37,6 +37,7 @@ RUN set -eux && \
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2_linux_${ARCH}/influxd /usr/local/bin/influxd && \ cp influxdb2_linux_${ARCH}/influxd /usr/local/bin/influxd && \
rm -rf influxdb2-* && \
influxd version influxd version
# Install the influx CLI # Install the influx CLI
...@@ -53,15 +54,14 @@ RUN set -eux && \ ...@@ -53,15 +54,14 @@ RUN set -eux && \
gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \ cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \
rm -rf influxdb2-* && \
influx version influx version
# Remove GNUPG Configuration # Remove GNUPG Configuration
RUN gpgconf --kill all && \ RUN gpgconf --kill all && \
rm -rf \ rm -rf \
"/root/.gnupg" \ "/root/.gnupg" \
influxdb2.key \ influxdb2.key
influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* \
influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}*
# Create standard directories expected by the entry-point. # Create standard directories expected by the entry-point.
RUN mkdir /docker-entrypoint-initdb.d && \ RUN mkdir /docker-entrypoint-initdb.d && \
......
influxdb/2.3/alpine/Dockerfile
+ 3
− 3
View file @ 60a9843b
...@@ -30,6 +30,7 @@ RUN set -eux && \ ...@@ -30,6 +30,7 @@ RUN set -eux && \
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2_linux_${ARCH}/influxd /usr/local/bin/influxd && \ cp influxdb2_linux_${ARCH}/influxd /usr/local/bin/influxd && \
rm -rf influxdb2-* && \
influxd version influxd version
# Install the influx CLI # Install the influx CLI
...@@ -48,15 +49,14 @@ RUN set -eux && \ ...@@ -48,15 +49,14 @@ RUN set -eux && \
gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \ cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \
rm -rf influxdb2-* && \
influx version influx version
# Remove GNUPG Configuration # Remove GNUPG Configuration
RUN gpgconf --kill all && \ RUN gpgconf --kill all && \
rm -rf \ rm -rf \
"/root/.gnupg" \ "/root/.gnupg" \
influxdb2.key \ influxdb2.key
influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* \
influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}*
# Create standard directories expected by the entry-point. # Create standard directories expected by the entry-point.
RUN mkdir /docker-entrypoint-initdb.d && \ RUN mkdir /docker-entrypoint-initdb.d && \
......
influxdb/2.4/Dockerfile
+ 3
− 3
View file @ 60a9843b
...@@ -37,6 +37,7 @@ RUN set -eux && \ ...@@ -37,6 +37,7 @@ RUN set -eux && \
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2_linux_${ARCH}/influxd /usr/local/bin/influxd && \ cp influxdb2_linux_${ARCH}/influxd /usr/local/bin/influxd && \
rm -rf influxdb2-* && \
influxd version influxd version
# Install the influx CLI # Install the influx CLI
...@@ -53,15 +54,14 @@ RUN set -eux && \ ...@@ -53,15 +54,14 @@ RUN set -eux && \
gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \ cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \
rm -rf influxdb2-* && \
influx version influx version
# Remove GNUPG Configuration # Remove GNUPG Configuration
RUN gpgconf --kill all && \ RUN gpgconf --kill all && \
rm -rf \ rm -rf \
"/root/.gnupg" \ "/root/.gnupg" \
influxdb2.key \ influxdb2.key
influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* \
influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}*
# Create standard directories expected by the entry-point. # Create standard directories expected by the entry-point.
RUN mkdir /docker-entrypoint-initdb.d && \ RUN mkdir /docker-entrypoint-initdb.d && \
......
influxdb/2.4/alpine/Dockerfile
+ 3
− 3
View file @ 60a9843b
...@@ -30,6 +30,7 @@ RUN set -eux && \ ...@@ -30,6 +30,7 @@ RUN set -eux && \
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2_linux_${ARCH}/influxd /usr/local/bin/influxd && \ cp influxdb2_linux_${ARCH}/influxd /usr/local/bin/influxd && \
rm -rf influxdb2-* && \
influxd version influxd version
# Install the influx CLI # Install the influx CLI
...@@ -48,15 +49,14 @@ RUN set -eux && \ ...@@ -48,15 +49,14 @@ RUN set -eux && \
gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \ tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \ cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \
rm -rf influxdb2-* && \
influx version influx version
# Remove GNUPG Configuration # Remove GNUPG Configuration
RUN gpgconf --kill all && \ RUN gpgconf --kill all && \
rm -rf \ rm -rf \
"/root/.gnupg" \ "/root/.gnupg" \
influxdb2.key \ influxdb2.key
influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* \
influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}*
# Create standard directories expected by the entry-point. # Create standard directories expected by the entry-point.
RUN mkdir /docker-entrypoint-initdb.d && \ RUN mkdir /docker-entrypoint-initdb.d && \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment