From f3583d59e55e84996ba96171d7488d502ff9ffb9 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 21 Jun 2019 13:36:29 -0700 Subject: [PATCH] Remove Erlang "examples" directories too --- 3.7-rc/alpine/Dockerfile | 6 +++++- 3.7-rc/ubuntu/Dockerfile | 6 +++++- 3.7/alpine/Dockerfile | 6 +++++- 3.7/ubuntu/Dockerfile | 6 +++++- 3.8-rc/alpine/Dockerfile | 6 +++++- 3.8-rc/ubuntu/Dockerfile | 6 +++++- Dockerfile-alpine.template | 6 +++++- Dockerfile-ubuntu.template | 6 +++++- 8 files changed, 40 insertions(+), 8 deletions(-) diff --git a/3.7-rc/alpine/Dockerfile b/3.7-rc/alpine/Dockerfile index 7386299..3971106 100644 --- a/3.7-rc/alpine/Dockerfile +++ b/3.7-rc/alpine/Dockerfile @@ -145,7 +145,11 @@ RUN set -eux; \ make -j "$(getconf _NPROCESSORS_ONLN)" GEN_OPT_FLGS="-O2 -fno-strict-aliasing"; \ make install; \ cd ..; \ - rm -rf "$OTP_PATH"* /usr/local/lib/erlang/lib/*/src; \ + rm -rf \ + "$OTP_PATH"* \ + /usr/local/lib/erlang/lib/*/examples \ + /usr/local/lib/erlang/lib/*/src \ + ; \ \ runDeps="$( \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ diff --git a/3.7-rc/ubuntu/Dockerfile b/3.7-rc/ubuntu/Dockerfile index f876207..e1d0297 100644 --- a/3.7-rc/ubuntu/Dockerfile +++ b/3.7-rc/ubuntu/Dockerfile @@ -150,7 +150,11 @@ RUN set -eux; \ make -j "$(getconf _NPROCESSORS_ONLN)" GEN_OPT_FLGS="-O2 -fno-strict-aliasing"; \ make install; \ cd ..; \ - rm -rf "$OTP_PATH"* /usr/local/lib/erlang/lib/*/src; \ + rm -rf \ + "$OTP_PATH"* \ + /usr/local/lib/erlang/lib/*/examples \ + /usr/local/lib/erlang/lib/*/src \ + ; \ \ # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies apt-mark auto '.*' > /dev/null; \ diff --git a/3.7/alpine/Dockerfile b/3.7/alpine/Dockerfile index cd636fe..83257f4 100644 --- a/3.7/alpine/Dockerfile +++ b/3.7/alpine/Dockerfile @@ -145,7 +145,11 @@ RUN set -eux; \ make -j "$(getconf _NPROCESSORS_ONLN)" GEN_OPT_FLGS="-O2 -fno-strict-aliasing"; \ make install; \ cd ..; \ - rm -rf "$OTP_PATH"* /usr/local/lib/erlang/lib/*/src; \ + rm -rf \ + "$OTP_PATH"* \ + /usr/local/lib/erlang/lib/*/examples \ + /usr/local/lib/erlang/lib/*/src \ + ; \ \ runDeps="$( \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ diff --git a/3.7/ubuntu/Dockerfile b/3.7/ubuntu/Dockerfile index 6ad95dc..cfd2553 100644 --- a/3.7/ubuntu/Dockerfile +++ b/3.7/ubuntu/Dockerfile @@ -150,7 +150,11 @@ RUN set -eux; \ make -j "$(getconf _NPROCESSORS_ONLN)" GEN_OPT_FLGS="-O2 -fno-strict-aliasing"; \ make install; \ cd ..; \ - rm -rf "$OTP_PATH"* /usr/local/lib/erlang/lib/*/src; \ + rm -rf \ + "$OTP_PATH"* \ + /usr/local/lib/erlang/lib/*/examples \ + /usr/local/lib/erlang/lib/*/src \ + ; \ \ # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies apt-mark auto '.*' > /dev/null; \ diff --git a/3.8-rc/alpine/Dockerfile b/3.8-rc/alpine/Dockerfile index 6595d47..a30fcd4 100644 --- a/3.8-rc/alpine/Dockerfile +++ b/3.8-rc/alpine/Dockerfile @@ -145,7 +145,11 @@ RUN set -eux; \ make -j "$(getconf _NPROCESSORS_ONLN)" GEN_OPT_FLGS="-O2 -fno-strict-aliasing"; \ make install; \ cd ..; \ - rm -rf "$OTP_PATH"* /usr/local/lib/erlang/lib/*/src; \ + rm -rf \ + "$OTP_PATH"* \ + /usr/local/lib/erlang/lib/*/examples \ + /usr/local/lib/erlang/lib/*/src \ + ; \ \ runDeps="$( \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ diff --git a/3.8-rc/ubuntu/Dockerfile b/3.8-rc/ubuntu/Dockerfile index fcea31b..093f898 100644 --- a/3.8-rc/ubuntu/Dockerfile +++ b/3.8-rc/ubuntu/Dockerfile @@ -150,7 +150,11 @@ RUN set -eux; \ make -j "$(getconf _NPROCESSORS_ONLN)" GEN_OPT_FLGS="-O2 -fno-strict-aliasing"; \ make install; \ cd ..; \ - rm -rf "$OTP_PATH"* /usr/local/lib/erlang/lib/*/src; \ + rm -rf \ + "$OTP_PATH"* \ + /usr/local/lib/erlang/lib/*/examples \ + /usr/local/lib/erlang/lib/*/src \ + ; \ \ # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies apt-mark auto '.*' > /dev/null; \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index d0a7a33..fc79e10 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -145,7 +145,11 @@ RUN set -eux; \ make -j "$(getconf _NPROCESSORS_ONLN)" GEN_OPT_FLGS="-O2 -fno-strict-aliasing"; \ make install; \ cd ..; \ - rm -rf "$OTP_PATH"* /usr/local/lib/erlang/lib/*/src; \ + rm -rf \ + "$OTP_PATH"* \ + /usr/local/lib/erlang/lib/*/examples \ + /usr/local/lib/erlang/lib/*/src \ + ; \ \ runDeps="$( \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ diff --git a/Dockerfile-ubuntu.template b/Dockerfile-ubuntu.template index 486c95e..4351436 100644 --- a/Dockerfile-ubuntu.template +++ b/Dockerfile-ubuntu.template @@ -150,7 +150,11 @@ RUN set -eux; \ make -j "$(getconf _NPROCESSORS_ONLN)" GEN_OPT_FLGS="-O2 -fno-strict-aliasing"; \ make install; \ cd ..; \ - rm -rf "$OTP_PATH"* /usr/local/lib/erlang/lib/*/src; \ + rm -rf \ + "$OTP_PATH"* \ + /usr/local/lib/erlang/lib/*/examples \ + /usr/local/lib/erlang/lib/*/src \ + ; \ \ # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies apt-mark auto '.*' > /dev/null; \