Skip to content

Commit 5387b51

Browse files
committed
minor image cleanup
Signed-off-by: Konstantin Demin <[email protected]>
1 parent f8184eb commit 5387b51

File tree

27 files changed

+162
-54
lines changed

27 files changed

+162
-54
lines changed

14/alpine3.16/Dockerfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ RUN addgroup -g 1000 node \
6767
&& apk del .build-deps \
6868
# smoke tests
6969
&& node --version \
70-
&& npm --version
70+
&& npm --version \
71+
# cleanup
72+
&& rm -rf /root/.gnupg /root/.npm
7173

7274
ENV YARN_VERSION 1.22.19
7375

@@ -88,7 +90,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
8890
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
8991
&& apk del .build-deps-yarn \
9092
# smoke test
91-
&& yarn --version
93+
&& yarn --version \
94+
# cleanup
95+
&& rm -rf /root/.gnupg /tmp/v8-compile-cache-*
9296

9397
COPY docker-entrypoint.sh /usr/local/bin/
9498
ENTRYPOINT ["docker-entrypoint.sh"]

14/alpine3.17/Dockerfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ RUN addgroup -g 1000 node \
6767
&& apk del .build-deps \
6868
# smoke tests
6969
&& node --version \
70-
&& npm --version
70+
&& npm --version \
71+
# cleanup
72+
&& rm -rf /root/.gnupg /root/.npm
7173

7274
ENV YARN_VERSION 1.22.19
7375

@@ -88,7 +90,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
8890
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
8991
&& apk del .build-deps-yarn \
9092
# smoke test
91-
&& yarn --version
93+
&& yarn --version \
94+
# cleanup
95+
&& rm -rf /root/.gnupg /tmp/v8-compile-cache-*
9296

9397
COPY docker-entrypoint.sh /usr/local/bin/
9498
ENTRYPOINT ["docker-entrypoint.sh"]

14/bullseye-slim/Dockerfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
5151
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs \
5252
# smoke tests
5353
&& node --version \
54-
&& npm --version
54+
&& npm --version \
55+
# cleanup
56+
&& rm -rf /root/.gnupg /root/.npm
5557

5658
ENV YARN_VERSION 1.22.19
5759

@@ -84,7 +86,9 @@ RUN set -ex \
8486
| xargs -r apt-mark manual \
8587
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
8688
# smoke test
87-
&& yarn --version
89+
&& yarn --version \
90+
# cleanup
91+
&& rm -rf /root/.gnupg /tmp/v8-compile-cache-*
8892

8993
COPY docker-entrypoint.sh /usr/local/bin/
9094
ENTRYPOINT ["docker-entrypoint.sh"]

14/bullseye/Dockerfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
4040
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs \
4141
# smoke tests
4242
&& node --version \
43-
&& npm --version
43+
&& npm --version \
44+
# cleanup
45+
&& rm -rf /root/.gnupg /root/.npm
4446

4547
ENV YARN_VERSION 1.22.19
4648

@@ -60,7 +62,9 @@ RUN set -ex \
6062
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
6163
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
6264
# smoke test
63-
&& yarn --version
65+
&& yarn --version \
66+
# cleanup
67+
&& rm -rf /root/.gnupg /tmp/v8-compile-cache-*
6468

6569
COPY docker-entrypoint.sh /usr/local/bin/
6670
ENTRYPOINT ["docker-entrypoint.sh"]

14/buster-slim/Dockerfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
5151
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs \
5252
# smoke tests
5353
&& node --version \
54-
&& npm --version
54+
&& npm --version \
55+
# cleanup
56+
&& rm -rf /root/.gnupg /root/.npm
5557

5658
ENV YARN_VERSION 1.22.19
5759

@@ -84,7 +86,9 @@ RUN set -ex \
8486
| xargs -r apt-mark manual \
8587
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
8688
# smoke test
87-
&& yarn --version
89+
&& yarn --version \
90+
# cleanup
91+
&& rm -rf /root/.gnupg /tmp/v8-compile-cache-*
8892

8993
COPY docker-entrypoint.sh /usr/local/bin/
9094
ENTRYPOINT ["docker-entrypoint.sh"]

14/buster/Dockerfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
4040
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs \
4141
# smoke tests
4242
&& node --version \
43-
&& npm --version
43+
&& npm --version \
44+
# cleanup
45+
&& rm -rf /root/.gnupg /root/.npm
4446

4547
ENV YARN_VERSION 1.22.19
4648

@@ -60,7 +62,9 @@ RUN set -ex \
6062
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
6163
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
6264
# smoke test
63-
&& yarn --version
65+
&& yarn --version \
66+
# cleanup
67+
&& rm -rf /root/.gnupg /tmp/v8-compile-cache-*
6468

6569
COPY docker-entrypoint.sh /usr/local/bin/
6670
ENTRYPOINT ["docker-entrypoint.sh"]

16/alpine3.16/Dockerfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ RUN addgroup -g 1000 node \
6868
&& apk del .build-deps \
6969
# smoke tests
7070
&& node --version \
71-
&& npm --version
71+
&& npm --version \
72+
# cleanup
73+
&& rm -rf /root/.gnupg /root/.npm
7274

7375
ENV YARN_VERSION 1.22.19
7476

@@ -89,7 +91,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
8991
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
9092
&& apk del .build-deps-yarn \
9193
# smoke test
92-
&& yarn --version
94+
&& yarn --version \
95+
# cleanup
96+
&& rm -rf /root/.gnupg /tmp/v8-compile-cache-*
9397

9498
COPY docker-entrypoint.sh /usr/local/bin/
9599
ENTRYPOINT ["docker-entrypoint.sh"]

16/alpine3.17/Dockerfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ RUN addgroup -g 1000 node \
6868
&& apk del .build-deps \
6969
# smoke tests
7070
&& node --version \
71-
&& npm --version
71+
&& npm --version \
72+
# cleanup
73+
&& rm -rf /root/.gnupg /root/.npm
7274

7375
ENV YARN_VERSION 1.22.19
7476

@@ -89,7 +91,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
8991
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
9092
&& apk del .build-deps-yarn \
9193
# smoke test
92-
&& yarn --version
94+
&& yarn --version \
95+
# cleanup
96+
&& rm -rf /root/.gnupg /tmp/v8-compile-cache-*
9397

9498
COPY docker-entrypoint.sh /usr/local/bin/
9599
ENTRYPOINT ["docker-entrypoint.sh"]

16/bullseye-slim/Dockerfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
5252
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs \
5353
# smoke tests
5454
&& node --version \
55-
&& npm --version
55+
&& npm --version \
56+
# cleanup
57+
&& rm -rf /root/.gnupg /root/.npm
5658

5759
ENV YARN_VERSION 1.22.19
5860

@@ -85,7 +87,9 @@ RUN set -ex \
8587
| xargs -r apt-mark manual \
8688
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
8789
# smoke test
88-
&& yarn --version
90+
&& yarn --version \
91+
# cleanup
92+
&& rm -rf /root/.gnupg /tmp/v8-compile-cache-*
8993

9094
COPY docker-entrypoint.sh /usr/local/bin/
9195
ENTRYPOINT ["docker-entrypoint.sh"]

16/bullseye/Dockerfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
4141
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs \
4242
# smoke tests
4343
&& node --version \
44-
&& npm --version
44+
&& npm --version \
45+
# cleanup
46+
&& rm -rf /root/.gnupg /root/.npm
4547

4648
ENV YARN_VERSION 1.22.19
4749

@@ -61,7 +63,9 @@ RUN set -ex \
6163
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
6264
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
6365
# smoke test
64-
&& yarn --version
66+
&& yarn --version \
67+
# cleanup
68+
&& rm -rf /root/.gnupg /tmp/v8-compile-cache-*
6569

6670
COPY docker-entrypoint.sh /usr/local/bin/
6771
ENTRYPOINT ["docker-entrypoint.sh"]

16/buster-slim/Dockerfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
5252
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs \
5353
# smoke tests
5454
&& node --version \
55-
&& npm --version
55+
&& npm --version \
56+
# cleanup
57+
&& rm -rf /root/.gnupg /root/.npm
5658

5759
ENV YARN_VERSION 1.22.19
5860

@@ -85,7 +87,9 @@ RUN set -ex \
8587
| xargs -r apt-mark manual \
8688
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
8789
# smoke test
88-
&& yarn --version
90+
&& yarn --version \
91+
# cleanup
92+
&& rm -rf /root/.gnupg /tmp/v8-compile-cache-*
8993

9094
COPY docker-entrypoint.sh /usr/local/bin/
9195
ENTRYPOINT ["docker-entrypoint.sh"]

16/buster/Dockerfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
4141
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs \
4242
# smoke tests
4343
&& node --version \
44-
&& npm --version
44+
&& npm --version \
45+
# cleanup
46+
&& rm -rf /root/.gnupg /root/.npm
4547

4648
ENV YARN_VERSION 1.22.19
4749

@@ -61,7 +63,9 @@ RUN set -ex \
6163
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
6264
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
6365
# smoke test
64-
&& yarn --version
66+
&& yarn --version \
67+
# cleanup
68+
&& rm -rf /root/.gnupg /tmp/v8-compile-cache-*
6569

6670
COPY docker-entrypoint.sh /usr/local/bin/
6771
ENTRYPOINT ["docker-entrypoint.sh"]

18/alpine3.16/Dockerfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ RUN addgroup -g 1000 node \
6868
&& apk del .build-deps \
6969
# smoke tests
7070
&& node --version \
71-
&& npm --version
71+
&& npm --version \
72+
# cleanup
73+
&& rm -rf /root/.gnupg /root/.npm
7274

7375
ENV YARN_VERSION 1.22.19
7476

@@ -89,7 +91,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
8991
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
9092
&& apk del .build-deps-yarn \
9193
# smoke test
92-
&& yarn --version
94+
&& yarn --version \
95+
# cleanup
96+
&& rm -rf /root/.gnupg /tmp/v8-compile-cache-*
9397

9498
COPY docker-entrypoint.sh /usr/local/bin/
9599
ENTRYPOINT ["docker-entrypoint.sh"]

18/alpine3.17/Dockerfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ RUN addgroup -g 1000 node \
6868
&& apk del .build-deps \
6969
# smoke tests
7070
&& node --version \
71-
&& npm --version
71+
&& npm --version \
72+
# cleanup
73+
&& rm -rf /root/.gnupg /root/.npm
7274

7375
ENV YARN_VERSION 1.22.19
7476

@@ -89,7 +91,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
8991
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
9092
&& apk del .build-deps-yarn \
9193
# smoke test
92-
&& yarn --version
94+
&& yarn --version \
95+
# cleanup
96+
&& rm -rf /root/.gnupg /tmp/v8-compile-cache-*
9397

9498
COPY docker-entrypoint.sh /usr/local/bin/
9599
ENTRYPOINT ["docker-entrypoint.sh"]

18/bullseye-slim/Dockerfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
5252
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs \
5353
# smoke tests
5454
&& node --version \
55-
&& npm --version
55+
&& npm --version \
56+
# cleanup
57+
&& rm -rf /root/.gnupg /root/.npm
5658

5759
ENV YARN_VERSION 1.22.19
5860

@@ -85,7 +87,9 @@ RUN set -ex \
8587
| xargs -r apt-mark manual \
8688
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
8789
# smoke test
88-
&& yarn --version
90+
&& yarn --version \
91+
# cleanup
92+
&& rm -rf /root/.gnupg /tmp/v8-compile-cache-*
8993

9094
COPY docker-entrypoint.sh /usr/local/bin/
9195
ENTRYPOINT ["docker-entrypoint.sh"]

18/bullseye/Dockerfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
4141
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs \
4242
# smoke tests
4343
&& node --version \
44-
&& npm --version
44+
&& npm --version \
45+
# cleanup
46+
&& rm -rf /root/.gnupg /root/.npm
4547

4648
ENV YARN_VERSION 1.22.19
4749

@@ -61,7 +63,9 @@ RUN set -ex \
6163
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
6264
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
6365
# smoke test
64-
&& yarn --version
66+
&& yarn --version \
67+
# cleanup
68+
&& rm -rf /root/.gnupg /tmp/v8-compile-cache-*
6569

6670
COPY docker-entrypoint.sh /usr/local/bin/
6771
ENTRYPOINT ["docker-entrypoint.sh"]

18/buster-slim/Dockerfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
5252
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs \
5353
# smoke tests
5454
&& node --version \
55-
&& npm --version
55+
&& npm --version \
56+
# cleanup
57+
&& rm -rf /root/.gnupg /root/.npm
5658

5759
ENV YARN_VERSION 1.22.19
5860

@@ -85,7 +87,9 @@ RUN set -ex \
8587
| xargs -r apt-mark manual \
8688
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
8789
# smoke test
88-
&& yarn --version
90+
&& yarn --version \
91+
# cleanup
92+
&& rm -rf /root/.gnupg /tmp/v8-compile-cache-*
8993

9094
COPY docker-entrypoint.sh /usr/local/bin/
9195
ENTRYPOINT ["docker-entrypoint.sh"]

18/buster/Dockerfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
4141
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs \
4242
# smoke tests
4343
&& node --version \
44-
&& npm --version
44+
&& npm --version \
45+
# cleanup
46+
&& rm -rf /root/.gnupg /root/.npm
4547

4648
ENV YARN_VERSION 1.22.19
4749

@@ -61,7 +63,9 @@ RUN set -ex \
6163
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
6264
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
6365
# smoke test
64-
&& yarn --version
66+
&& yarn --version \
67+
# cleanup
68+
&& rm -rf /root/.gnupg /tmp/v8-compile-cache-*
6569

6670
COPY docker-entrypoint.sh /usr/local/bin/
6771
ENTRYPOINT ["docker-entrypoint.sh"]

0 commit comments

Comments
 (0)