diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2 index 65bcd1dd..55467f25 100644 --- a/Dockerfiles/mods/Dockerfile-5.2 +++ b/Dockerfiles/mods/Dockerfile-5.2 @@ -460,10 +460,10 @@ ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype \ && update-ca-certificates \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index 76be5d59..8ce39271 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -504,10 +504,10 @@ RUN set -x \ \ && update-ca-certificates \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4 index 73c89179..ecf69ec2 100644 --- a/Dockerfiles/mods/Dockerfile-5.4 +++ b/Dockerfiles/mods/Dockerfile-5.4 @@ -509,10 +509,10 @@ RUN set -x \ \ && update-ca-certificates \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index cce83ec2..51d7b9b3 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -507,10 +507,10 @@ RUN set -x \ \ && update-ca-certificates \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index 0db79e5e..0e6aeb7d 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -507,10 +507,10 @@ RUN set -x \ \ && update-ca-certificates \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index e5d6f887..34d102c4 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -506,10 +506,10 @@ RUN set -x \ \ && update-ca-certificates \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1 index eee0656c..3d703290 100644 --- a/Dockerfiles/mods/Dockerfile-7.1 +++ b/Dockerfiles/mods/Dockerfile-7.1 @@ -509,10 +509,10 @@ RUN set -x \ \ && update-ca-certificates \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index d630a619..edc6d905 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -514,10 +514,10 @@ RUN set -x \ \ && update-ca-certificates \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index 5a0dd6a4..ae93e5d4 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -502,10 +502,10 @@ RUN set -x \ \ && update-ca-certificates \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/prod/Dockerfile-5.2 b/Dockerfiles/prod/Dockerfile-5.2 index 7825b3c7..5e3a012d 100644 --- a/Dockerfiles/prod/Dockerfile-5.2 +++ b/Dockerfiles/prod/Dockerfile-5.2 @@ -34,9 +34,9 @@ RUN set -x \ && mkdir -p /etc/supervisor/conf.d \ && mkdir -p /var/log/supervisor \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true diff --git a/Dockerfiles/prod/Dockerfile-5.3 b/Dockerfiles/prod/Dockerfile-5.3 index 654776f9..7c8b4eaf 100644 --- a/Dockerfiles/prod/Dockerfile-5.3 +++ b/Dockerfiles/prod/Dockerfile-5.3 @@ -34,9 +34,9 @@ RUN set -x \ && mkdir -p /etc/supervisor/conf.d \ && mkdir -p /var/log/supervisor \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true diff --git a/Dockerfiles/prod/Dockerfile-5.4 b/Dockerfiles/prod/Dockerfile-5.4 index 1889bb11..8e3aae65 100644 --- a/Dockerfiles/prod/Dockerfile-5.4 +++ b/Dockerfiles/prod/Dockerfile-5.4 @@ -34,9 +34,9 @@ RUN set -x \ && mkdir -p /etc/supervisor/conf.d \ && mkdir -p /var/log/supervisor \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true diff --git a/Dockerfiles/prod/Dockerfile-5.5 b/Dockerfiles/prod/Dockerfile-5.5 index a68c45e0..b20abb44 100644 --- a/Dockerfiles/prod/Dockerfile-5.5 +++ b/Dockerfiles/prod/Dockerfile-5.5 @@ -34,9 +34,9 @@ RUN set -x \ && mkdir -p /etc/supervisor/conf.d \ && mkdir -p /var/log/supervisor \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true diff --git a/Dockerfiles/prod/Dockerfile-5.6 b/Dockerfiles/prod/Dockerfile-5.6 index 0a2216d1..848e7214 100644 --- a/Dockerfiles/prod/Dockerfile-5.6 +++ b/Dockerfiles/prod/Dockerfile-5.6 @@ -34,9 +34,9 @@ RUN set -x \ && mkdir -p /etc/supervisor/conf.d \ && mkdir -p /var/log/supervisor \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true diff --git a/Dockerfiles/prod/Dockerfile-7.0 b/Dockerfiles/prod/Dockerfile-7.0 index 6819783f..03af05a7 100644 --- a/Dockerfiles/prod/Dockerfile-7.0 +++ b/Dockerfiles/prod/Dockerfile-7.0 @@ -34,9 +34,9 @@ RUN set -x \ && mkdir -p /etc/supervisor/conf.d \ && mkdir -p /var/log/supervisor \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true diff --git a/Dockerfiles/prod/Dockerfile-7.1 b/Dockerfiles/prod/Dockerfile-7.1 index 57c196e0..70b56617 100644 --- a/Dockerfiles/prod/Dockerfile-7.1 +++ b/Dockerfiles/prod/Dockerfile-7.1 @@ -34,9 +34,9 @@ RUN set -x \ && mkdir -p /etc/supervisor/conf.d \ && mkdir -p /var/log/supervisor \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true diff --git a/Dockerfiles/prod/Dockerfile-7.2 b/Dockerfiles/prod/Dockerfile-7.2 index bce2f790..1a38dc65 100644 --- a/Dockerfiles/prod/Dockerfile-7.2 +++ b/Dockerfiles/prod/Dockerfile-7.2 @@ -34,9 +34,9 @@ RUN set -x \ && mkdir -p /etc/supervisor/conf.d \ && mkdir -p /var/log/supervisor \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true diff --git a/Dockerfiles/prod/Dockerfile-7.3 b/Dockerfiles/prod/Dockerfile-7.3 index 15040bec..14daca81 100644 --- a/Dockerfiles/prod/Dockerfile-7.3 +++ b/Dockerfiles/prod/Dockerfile-7.3 @@ -34,9 +34,9 @@ RUN set -x \ && mkdir -p /etc/supervisor/conf.d \ && mkdir -p /var/log/supervisor \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index d97a1af2..961d6e6d 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -105,15 +105,21 @@ RUN set -x \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ +# Get newer pip version + && pip install --upgrade pip \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false python-pip \ + && rm -rf /var/lib/apt/lists/* \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true RUN set -x \ # ansible - && pip install --no-cache-dir --upgrade setuptools \ -&& pip install --no-cache-dir ansible \ + && /usr/local/bin/pip install --no-cache-dir --upgrade setuptools \ +&& /usr/local/bin/pip install --no-cache-dir ansible \ \ # awesomeci && git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \ @@ -199,7 +205,7 @@ RUN set -x \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ \ - && pip install --no-cache-dir yamllint \ + && /usr/local/bin/pip install --no-cache-dir yamllint \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ && rm -rf /var/lib/apt/lists/* \ \ @@ -224,9 +230,12 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ + && rm -rf /usr/local/src/composer/cache/* || true \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 4698f27a..508e4d2e 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -105,17 +105,23 @@ RUN set -x \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ +# Get newer pip version + && pip install --upgrade pip \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false python-pip \ + && rm -rf /var/lib/apt/lists/* \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install --no-cache-dir --upgrade setuptools \ -&& pip install --no-cache-dir ansible \ + && /usr/local/bin/pip install --no-cache-dir --upgrade setuptools \ +&& /usr/local/bin/pip install --no-cache-dir ansible \ \ # awesomeci && git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \ @@ -236,7 +242,7 @@ RUN set -x \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ \ - && pip install --no-cache-dir yamllint \ + && /usr/local/bin/pip install --no-cache-dir yamllint \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ && rm -rf /var/lib/apt/lists/* \ \ @@ -261,9 +267,12 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ + && rm -rf /usr/local/src/composer/cache/* || true \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 27efe3a2..13c59150 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -105,17 +105,23 @@ RUN set -x \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ +# Get newer pip version + && pip install --upgrade pip \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false python-pip \ + && rm -rf /var/lib/apt/lists/* \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install --no-cache-dir --upgrade setuptools \ -&& pip install --no-cache-dir ansible \ + && /usr/local/bin/pip install --no-cache-dir --upgrade setuptools \ +&& /usr/local/bin/pip install --no-cache-dir ansible \ \ # awesomeci && git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \ @@ -265,7 +271,7 @@ RUN set -x \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ \ - && pip install --no-cache-dir yamllint \ + && /usr/local/bin/pip install --no-cache-dir yamllint \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ && rm -rf /var/lib/apt/lists/* \ \ @@ -290,9 +296,12 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ + && rm -rf /usr/local/src/composer/cache/* || true \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 90cbbc77..606b3df9 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -105,17 +105,23 @@ RUN set -x \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ +# Get newer pip version + && pip install --upgrade pip \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false python-pip \ + && rm -rf /var/lib/apt/lists/* \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install --no-cache-dir --upgrade setuptools \ -&& pip install --no-cache-dir ansible \ + && /usr/local/bin/pip install --no-cache-dir --upgrade setuptools \ +&& /usr/local/bin/pip install --no-cache-dir ansible \ \ # asgardcms && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ @@ -276,7 +282,7 @@ RUN set -x \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ \ - && pip install --no-cache-dir yamllint \ + && /usr/local/bin/pip install --no-cache-dir yamllint \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ && rm -rf /var/lib/apt/lists/* \ \ @@ -301,9 +307,12 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ + && rm -rf /usr/local/src/composer/cache/* || true \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 5fbcfc1d..c105fd61 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -105,17 +105,23 @@ RUN set -x \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ +# Get newer pip version + && pip install --upgrade pip \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false python-pip \ + && rm -rf /var/lib/apt/lists/* \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install --no-cache-dir --upgrade setuptools \ -&& pip install --no-cache-dir ansible \ + && /usr/local/bin/pip install --no-cache-dir --upgrade setuptools \ +&& /usr/local/bin/pip install --no-cache-dir ansible \ \ # asgardcms && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ @@ -289,7 +295,7 @@ RUN set -x \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ \ - && pip install --no-cache-dir yamllint \ + && /usr/local/bin/pip install --no-cache-dir yamllint \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ && rm -rf /var/lib/apt/lists/* \ \ @@ -314,9 +320,12 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ + && rm -rf /usr/local/src/composer/cache/* || true \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index c2c4acfd..c876a841 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -105,17 +105,23 @@ RUN set -x \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ +# Get newer pip version + && pip install --upgrade pip \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false python-pip \ + && rm -rf /var/lib/apt/lists/* \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install --no-cache-dir --upgrade setuptools \ -&& pip install --no-cache-dir ansible \ + && /usr/local/bin/pip install --no-cache-dir --upgrade setuptools \ +&& /usr/local/bin/pip install --no-cache-dir ansible \ \ # asgardcms && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ @@ -289,7 +295,7 @@ RUN set -x \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ \ - && pip install --no-cache-dir yamllint \ + && /usr/local/bin/pip install --no-cache-dir yamllint \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ && rm -rf /var/lib/apt/lists/* \ \ @@ -314,9 +320,12 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ + && rm -rf /usr/local/src/composer/cache/* || true \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index e16409bf..341930e6 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -105,17 +105,23 @@ RUN set -x \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ +# Get newer pip version + && pip install --upgrade pip \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false python-pip \ + && rm -rf /var/lib/apt/lists/* \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install --no-cache-dir --upgrade setuptools \ -&& pip install --no-cache-dir ansible \ + && /usr/local/bin/pip install --no-cache-dir --upgrade setuptools \ +&& /usr/local/bin/pip install --no-cache-dir ansible \ \ # asgardcms && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ @@ -289,7 +295,7 @@ RUN set -x \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ \ - && pip install --no-cache-dir yamllint \ + && /usr/local/bin/pip install --no-cache-dir yamllint \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ && rm -rf /var/lib/apt/lists/* \ \ @@ -314,9 +320,12 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ + && rm -rf /usr/local/src/composer/cache/* || true \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 73ae5755..c057d9d6 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -105,17 +105,23 @@ RUN set -x \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ +# Get newer pip version + && pip install --upgrade pip \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false python-pip \ + && rm -rf /var/lib/apt/lists/* \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install --no-cache-dir --upgrade setuptools \ -&& pip install --no-cache-dir ansible \ + && /usr/local/bin/pip install --no-cache-dir --upgrade setuptools \ +&& /usr/local/bin/pip install --no-cache-dir ansible \ \ # asgardcms && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ @@ -289,7 +295,7 @@ RUN set -x \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ \ - && pip install --no-cache-dir yamllint \ + && /usr/local/bin/pip install --no-cache-dir yamllint \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ && rm -rf /var/lib/apt/lists/* \ \ @@ -314,9 +320,12 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ + && rm -rf /usr/local/src/composer/cache/* || true \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 9b9b9d59..23ca571e 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -105,17 +105,23 @@ RUN set -x \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ +# Get newer pip version + && pip install --upgrade pip \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false python-pip \ + && rm -rf /var/lib/apt/lists/* \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install --no-cache-dir --upgrade setuptools \ -&& pip install --no-cache-dir ansible \ + && /usr/local/bin/pip install --no-cache-dir --upgrade setuptools \ +&& /usr/local/bin/pip install --no-cache-dir ansible \ \ # asgardcms && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ @@ -278,7 +284,7 @@ RUN set -x \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ \ - && pip install --no-cache-dir yamllint \ + && /usr/local/bin/pip install --no-cache-dir yamllint \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ && rm -rf /var/lib/apt/lists/* \ \ @@ -303,9 +309,12 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ + && rm -rf /usr/local/src/composer/cache/* || true \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/build/ansible/DOCKERFILES/Dockerfile-mods.j2 b/build/ansible/DOCKERFILES/Dockerfile-mods.j2 index a95ff4c4..dff6f52a 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-mods.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-mods.j2 @@ -190,10 +190,10 @@ RUN set -x \ \ && update-ca-certificates \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true {% if debug %} diff --git a/build/ansible/DOCKERFILES/Dockerfile-prod.j2 b/build/ansible/DOCKERFILES/Dockerfile-prod.j2 index 8934ebd4..de0d5d50 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-prod.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-prod.j2 @@ -34,9 +34,9 @@ RUN set -x \ && mkdir -p /etc/supervisor/conf.d \ && mkdir -p /var/log/supervisor \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index cbbed7a8..ac28c2d9 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -126,9 +126,15 @@ RUN set -x \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ +# Get newer pip version + && pip install --upgrade pip \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false python-pip \ + && rm -rf /var/lib/apt/lists/* \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true RUN set -x \ @@ -159,9 +165,12 @@ RUN set -x \ {% endif %} {% endif %} {% endfor %} - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ + && rm -rf /usr/local/src/composer/cache/* || true \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index a8286369..551a22ca 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -303,8 +303,8 @@ software_available: check: ansible --version | grep -E '^ansible [.0-9]+$' all: command: | - pip install --no-cache-dir --upgrade setuptools \ - && pip install --no-cache-dir ansible \ + /usr/local/bin/pip install --no-cache-dir --upgrade setuptools \ + && /usr/local/bin/pip install --no-cache-dir ansible \ awesomeci: check: | mdl --version | grep -E '[.0-9]+' \ @@ -613,7 +613,7 @@ software_available: pre: | DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ - command: pip install --no-cache-dir yamllint + command: /usr/local/bin/pip install --no-cache-dir yamllint post: | DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ && rm -rf /var/lib/apt/lists/* \