From 045a06d87bcb5ac5975180733370a72bfb436d53 Mon Sep 17 00:00:00 2001 From: ffais Date: Thu, 22 Aug 2024 11:53:50 +0200 Subject: [PATCH] fix: disable extract file modified time. Signed-off-by: ffais --- beta/php8.1/apache/docker-entrypoint.sh | 5 ++++- beta/php8.1/fpm-alpine/docker-entrypoint.sh | 5 ++++- beta/php8.1/fpm/docker-entrypoint.sh | 5 ++++- beta/php8.2/apache/docker-entrypoint.sh | 5 ++++- beta/php8.2/fpm-alpine/docker-entrypoint.sh | 5 ++++- beta/php8.2/fpm/docker-entrypoint.sh | 5 ++++- beta/php8.3/apache/docker-entrypoint.sh | 5 ++++- beta/php8.3/fpm-alpine/docker-entrypoint.sh | 5 ++++- beta/php8.3/fpm/docker-entrypoint.sh | 5 ++++- docker-entrypoint.sh | 5 ++++- latest/php8.1/apache/docker-entrypoint.sh | 5 ++++- latest/php8.1/fpm-alpine/docker-entrypoint.sh | 5 ++++- latest/php8.1/fpm/docker-entrypoint.sh | 5 ++++- latest/php8.2/apache/docker-entrypoint.sh | 5 ++++- latest/php8.2/fpm-alpine/docker-entrypoint.sh | 5 ++++- latest/php8.2/fpm/docker-entrypoint.sh | 5 ++++- latest/php8.3/apache/docker-entrypoint.sh | 5 ++++- latest/php8.3/fpm-alpine/docker-entrypoint.sh | 5 ++++- latest/php8.3/fpm/docker-entrypoint.sh | 5 ++++- 19 files changed, 76 insertions(+), 19 deletions(-) diff --git a/beta/php8.1/apache/docker-entrypoint.sh b/beta/php8.1/apache/docker-entrypoint.sh index 1034f1dec1..19c9107b77 100755 --- a/beta/php8.1/apache/docker-entrypoint.sh +++ b/beta/php8.1/apache/docker-entrypoint.sh @@ -47,7 +47,10 @@ if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then ) if [ "$uid" != '0' ]; then # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted" - targetTarArgs+=( --no-overwrite-dir ) + targetTarArgs+=( + --no-overwrite-dir + --touch + ) fi # loop over "pluggable" content in the source, and if it already exists in the destination, skip it # https://github.com/docker-library/wordpress/issues/506 ("wp-content" persisted, "akismet" updated, WordPress container restarted/recreated, "akismet" downgraded) diff --git a/beta/php8.1/fpm-alpine/docker-entrypoint.sh b/beta/php8.1/fpm-alpine/docker-entrypoint.sh index 1034f1dec1..19c9107b77 100755 --- a/beta/php8.1/fpm-alpine/docker-entrypoint.sh +++ b/beta/php8.1/fpm-alpine/docker-entrypoint.sh @@ -47,7 +47,10 @@ if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then ) if [ "$uid" != '0' ]; then # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted" - targetTarArgs+=( --no-overwrite-dir ) + targetTarArgs+=( + --no-overwrite-dir + --touch + ) fi # loop over "pluggable" content in the source, and if it already exists in the destination, skip it # https://github.com/docker-library/wordpress/issues/506 ("wp-content" persisted, "akismet" updated, WordPress container restarted/recreated, "akismet" downgraded) diff --git a/beta/php8.1/fpm/docker-entrypoint.sh b/beta/php8.1/fpm/docker-entrypoint.sh index 1034f1dec1..19c9107b77 100755 --- a/beta/php8.1/fpm/docker-entrypoint.sh +++ b/beta/php8.1/fpm/docker-entrypoint.sh @@ -47,7 +47,10 @@ if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then ) if [ "$uid" != '0' ]; then # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted" - targetTarArgs+=( --no-overwrite-dir ) + targetTarArgs+=( + --no-overwrite-dir + --touch + ) fi # loop over "pluggable" content in the source, and if it already exists in the destination, skip it # https://github.com/docker-library/wordpress/issues/506 ("wp-content" persisted, "akismet" updated, WordPress container restarted/recreated, "akismet" downgraded) diff --git a/beta/php8.2/apache/docker-entrypoint.sh b/beta/php8.2/apache/docker-entrypoint.sh index 1034f1dec1..19c9107b77 100755 --- a/beta/php8.2/apache/docker-entrypoint.sh +++ b/beta/php8.2/apache/docker-entrypoint.sh @@ -47,7 +47,10 @@ if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then ) if [ "$uid" != '0' ]; then # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted" - targetTarArgs+=( --no-overwrite-dir ) + targetTarArgs+=( + --no-overwrite-dir + --touch + ) fi # loop over "pluggable" content in the source, and if it already exists in the destination, skip it # https://github.com/docker-library/wordpress/issues/506 ("wp-content" persisted, "akismet" updated, WordPress container restarted/recreated, "akismet" downgraded) diff --git a/beta/php8.2/fpm-alpine/docker-entrypoint.sh b/beta/php8.2/fpm-alpine/docker-entrypoint.sh index 1034f1dec1..19c9107b77 100755 --- a/beta/php8.2/fpm-alpine/docker-entrypoint.sh +++ b/beta/php8.2/fpm-alpine/docker-entrypoint.sh @@ -47,7 +47,10 @@ if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then ) if [ "$uid" != '0' ]; then # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted" - targetTarArgs+=( --no-overwrite-dir ) + targetTarArgs+=( + --no-overwrite-dir + --touch + ) fi # loop over "pluggable" content in the source, and if it already exists in the destination, skip it # https://github.com/docker-library/wordpress/issues/506 ("wp-content" persisted, "akismet" updated, WordPress container restarted/recreated, "akismet" downgraded) diff --git a/beta/php8.2/fpm/docker-entrypoint.sh b/beta/php8.2/fpm/docker-entrypoint.sh index 1034f1dec1..19c9107b77 100755 --- a/beta/php8.2/fpm/docker-entrypoint.sh +++ b/beta/php8.2/fpm/docker-entrypoint.sh @@ -47,7 +47,10 @@ if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then ) if [ "$uid" != '0' ]; then # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted" - targetTarArgs+=( --no-overwrite-dir ) + targetTarArgs+=( + --no-overwrite-dir + --touch + ) fi # loop over "pluggable" content in the source, and if it already exists in the destination, skip it # https://github.com/docker-library/wordpress/issues/506 ("wp-content" persisted, "akismet" updated, WordPress container restarted/recreated, "akismet" downgraded) diff --git a/beta/php8.3/apache/docker-entrypoint.sh b/beta/php8.3/apache/docker-entrypoint.sh index 1034f1dec1..19c9107b77 100755 --- a/beta/php8.3/apache/docker-entrypoint.sh +++ b/beta/php8.3/apache/docker-entrypoint.sh @@ -47,7 +47,10 @@ if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then ) if [ "$uid" != '0' ]; then # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted" - targetTarArgs+=( --no-overwrite-dir ) + targetTarArgs+=( + --no-overwrite-dir + --touch + ) fi # loop over "pluggable" content in the source, and if it already exists in the destination, skip it # https://github.com/docker-library/wordpress/issues/506 ("wp-content" persisted, "akismet" updated, WordPress container restarted/recreated, "akismet" downgraded) diff --git a/beta/php8.3/fpm-alpine/docker-entrypoint.sh b/beta/php8.3/fpm-alpine/docker-entrypoint.sh index 1034f1dec1..19c9107b77 100755 --- a/beta/php8.3/fpm-alpine/docker-entrypoint.sh +++ b/beta/php8.3/fpm-alpine/docker-entrypoint.sh @@ -47,7 +47,10 @@ if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then ) if [ "$uid" != '0' ]; then # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted" - targetTarArgs+=( --no-overwrite-dir ) + targetTarArgs+=( + --no-overwrite-dir + --touch + ) fi # loop over "pluggable" content in the source, and if it already exists in the destination, skip it # https://github.com/docker-library/wordpress/issues/506 ("wp-content" persisted, "akismet" updated, WordPress container restarted/recreated, "akismet" downgraded) diff --git a/beta/php8.3/fpm/docker-entrypoint.sh b/beta/php8.3/fpm/docker-entrypoint.sh index 1034f1dec1..19c9107b77 100755 --- a/beta/php8.3/fpm/docker-entrypoint.sh +++ b/beta/php8.3/fpm/docker-entrypoint.sh @@ -47,7 +47,10 @@ if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then ) if [ "$uid" != '0' ]; then # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted" - targetTarArgs+=( --no-overwrite-dir ) + targetTarArgs+=( + --no-overwrite-dir + --touch + ) fi # loop over "pluggable" content in the source, and if it already exists in the destination, skip it # https://github.com/docker-library/wordpress/issues/506 ("wp-content" persisted, "akismet" updated, WordPress container restarted/recreated, "akismet" downgraded) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 1034f1dec1..19c9107b77 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -47,7 +47,10 @@ if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then ) if [ "$uid" != '0' ]; then # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted" - targetTarArgs+=( --no-overwrite-dir ) + targetTarArgs+=( + --no-overwrite-dir + --touch + ) fi # loop over "pluggable" content in the source, and if it already exists in the destination, skip it # https://github.com/docker-library/wordpress/issues/506 ("wp-content" persisted, "akismet" updated, WordPress container restarted/recreated, "akismet" downgraded) diff --git a/latest/php8.1/apache/docker-entrypoint.sh b/latest/php8.1/apache/docker-entrypoint.sh index 1034f1dec1..19c9107b77 100755 --- a/latest/php8.1/apache/docker-entrypoint.sh +++ b/latest/php8.1/apache/docker-entrypoint.sh @@ -47,7 +47,10 @@ if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then ) if [ "$uid" != '0' ]; then # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted" - targetTarArgs+=( --no-overwrite-dir ) + targetTarArgs+=( + --no-overwrite-dir + --touch + ) fi # loop over "pluggable" content in the source, and if it already exists in the destination, skip it # https://github.com/docker-library/wordpress/issues/506 ("wp-content" persisted, "akismet" updated, WordPress container restarted/recreated, "akismet" downgraded) diff --git a/latest/php8.1/fpm-alpine/docker-entrypoint.sh b/latest/php8.1/fpm-alpine/docker-entrypoint.sh index 1034f1dec1..19c9107b77 100755 --- a/latest/php8.1/fpm-alpine/docker-entrypoint.sh +++ b/latest/php8.1/fpm-alpine/docker-entrypoint.sh @@ -47,7 +47,10 @@ if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then ) if [ "$uid" != '0' ]; then # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted" - targetTarArgs+=( --no-overwrite-dir ) + targetTarArgs+=( + --no-overwrite-dir + --touch + ) fi # loop over "pluggable" content in the source, and if it already exists in the destination, skip it # https://github.com/docker-library/wordpress/issues/506 ("wp-content" persisted, "akismet" updated, WordPress container restarted/recreated, "akismet" downgraded) diff --git a/latest/php8.1/fpm/docker-entrypoint.sh b/latest/php8.1/fpm/docker-entrypoint.sh index 1034f1dec1..19c9107b77 100755 --- a/latest/php8.1/fpm/docker-entrypoint.sh +++ b/latest/php8.1/fpm/docker-entrypoint.sh @@ -47,7 +47,10 @@ if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then ) if [ "$uid" != '0' ]; then # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted" - targetTarArgs+=( --no-overwrite-dir ) + targetTarArgs+=( + --no-overwrite-dir + --touch + ) fi # loop over "pluggable" content in the source, and if it already exists in the destination, skip it # https://github.com/docker-library/wordpress/issues/506 ("wp-content" persisted, "akismet" updated, WordPress container restarted/recreated, "akismet" downgraded) diff --git a/latest/php8.2/apache/docker-entrypoint.sh b/latest/php8.2/apache/docker-entrypoint.sh index 1034f1dec1..19c9107b77 100755 --- a/latest/php8.2/apache/docker-entrypoint.sh +++ b/latest/php8.2/apache/docker-entrypoint.sh @@ -47,7 +47,10 @@ if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then ) if [ "$uid" != '0' ]; then # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted" - targetTarArgs+=( --no-overwrite-dir ) + targetTarArgs+=( + --no-overwrite-dir + --touch + ) fi # loop over "pluggable" content in the source, and if it already exists in the destination, skip it # https://github.com/docker-library/wordpress/issues/506 ("wp-content" persisted, "akismet" updated, WordPress container restarted/recreated, "akismet" downgraded) diff --git a/latest/php8.2/fpm-alpine/docker-entrypoint.sh b/latest/php8.2/fpm-alpine/docker-entrypoint.sh index 1034f1dec1..19c9107b77 100755 --- a/latest/php8.2/fpm-alpine/docker-entrypoint.sh +++ b/latest/php8.2/fpm-alpine/docker-entrypoint.sh @@ -47,7 +47,10 @@ if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then ) if [ "$uid" != '0' ]; then # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted" - targetTarArgs+=( --no-overwrite-dir ) + targetTarArgs+=( + --no-overwrite-dir + --touch + ) fi # loop over "pluggable" content in the source, and if it already exists in the destination, skip it # https://github.com/docker-library/wordpress/issues/506 ("wp-content" persisted, "akismet" updated, WordPress container restarted/recreated, "akismet" downgraded) diff --git a/latest/php8.2/fpm/docker-entrypoint.sh b/latest/php8.2/fpm/docker-entrypoint.sh index 1034f1dec1..19c9107b77 100755 --- a/latest/php8.2/fpm/docker-entrypoint.sh +++ b/latest/php8.2/fpm/docker-entrypoint.sh @@ -47,7 +47,10 @@ if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then ) if [ "$uid" != '0' ]; then # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted" - targetTarArgs+=( --no-overwrite-dir ) + targetTarArgs+=( + --no-overwrite-dir + --touch + ) fi # loop over "pluggable" content in the source, and if it already exists in the destination, skip it # https://github.com/docker-library/wordpress/issues/506 ("wp-content" persisted, "akismet" updated, WordPress container restarted/recreated, "akismet" downgraded) diff --git a/latest/php8.3/apache/docker-entrypoint.sh b/latest/php8.3/apache/docker-entrypoint.sh index 1034f1dec1..19c9107b77 100755 --- a/latest/php8.3/apache/docker-entrypoint.sh +++ b/latest/php8.3/apache/docker-entrypoint.sh @@ -47,7 +47,10 @@ if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then ) if [ "$uid" != '0' ]; then # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted" - targetTarArgs+=( --no-overwrite-dir ) + targetTarArgs+=( + --no-overwrite-dir + --touch + ) fi # loop over "pluggable" content in the source, and if it already exists in the destination, skip it # https://github.com/docker-library/wordpress/issues/506 ("wp-content" persisted, "akismet" updated, WordPress container restarted/recreated, "akismet" downgraded) diff --git a/latest/php8.3/fpm-alpine/docker-entrypoint.sh b/latest/php8.3/fpm-alpine/docker-entrypoint.sh index 1034f1dec1..19c9107b77 100755 --- a/latest/php8.3/fpm-alpine/docker-entrypoint.sh +++ b/latest/php8.3/fpm-alpine/docker-entrypoint.sh @@ -47,7 +47,10 @@ if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then ) if [ "$uid" != '0' ]; then # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted" - targetTarArgs+=( --no-overwrite-dir ) + targetTarArgs+=( + --no-overwrite-dir + --touch + ) fi # loop over "pluggable" content in the source, and if it already exists in the destination, skip it # https://github.com/docker-library/wordpress/issues/506 ("wp-content" persisted, "akismet" updated, WordPress container restarted/recreated, "akismet" downgraded) diff --git a/latest/php8.3/fpm/docker-entrypoint.sh b/latest/php8.3/fpm/docker-entrypoint.sh index 1034f1dec1..19c9107b77 100755 --- a/latest/php8.3/fpm/docker-entrypoint.sh +++ b/latest/php8.3/fpm/docker-entrypoint.sh @@ -47,7 +47,10 @@ if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then ) if [ "$uid" != '0' ]; then # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted" - targetTarArgs+=( --no-overwrite-dir ) + targetTarArgs+=( + --no-overwrite-dir + --touch + ) fi # loop over "pluggable" content in the source, and if it already exists in the destination, skip it # https://github.com/docker-library/wordpress/issues/506 ("wp-content" persisted, "akismet" updated, WordPress container restarted/recreated, "akismet" downgraded)