Skip to content

Commit 33d2d37

Browse files
johnbilliondesrosj
johnbillion
and
desrosj
authored
Don't update legacy containers (#185)
* Don't update legacy containers as they're no longer rebuilt or republished. * Revert bf6b42c for legacy containers These images are no longer rebuilt, so these changes were never tested and released. * Revert c873c0c and 3206422 for legacy containers These containers are no longer built, so these changes were never tested and released. --------- Co-authored-by: Jonathan Desrosiers <[email protected]> Co-authored-by: Jonathan Desrosiers <[email protected]>
1 parent 67911f9 commit 33d2d37

File tree

16 files changed

+43
-255
lines changed

16 files changed

+43
-255
lines changed

‎images/5.2/php/common.sh‎

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,18 @@
11
#!/bin/bash
22
set -e
33

4-
# Check if an extension is available
5-
extension_available() {
6-
local ext=$1
7-
if [ -f "/usr/local/lib/php/extensions/$(php -r 'echo PHP_EXTENSION_DIR;' | xargs basename)/${ext}.so" ]; then
8-
return 0
9-
fi
10-
return 1
11-
}
12-
134
# If LOCAL_PHP_XDEBUG=true xdebug extension will be enabled
145
if [ "$LOCAL_PHP_XDEBUG" = true ]; then
15-
if extension_available "xdebug"; then
16-
docker-php-ext-enable xdebug
17-
rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
18-
else
19-
echo "Warning: xdebug extension not available, skipping..."
20-
fi
6+
docker-php-ext-enable xdebug
7+
rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
218
else
22-
if extension_available "opcache"; then
23-
docker-php-ext-enable opcache
24-
rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
25-
else
26-
# OPcache might be built-in, check if it's already loaded
27-
if ! php -m | grep -q "Zend OPcache"; then
28-
echo "Warning: opcache extension not available, skipping..."
29-
fi
30-
fi
9+
docker-php-ext-enable opcache
10+
rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
3111
fi
3212

3313
# If LOCAL_PHP_MEMCACHED=true memcached extension will be enabled
3414
if [ "$LOCAL_PHP_MEMCACHED" = true ]; then
35-
if extension_available "memcached"; then
36-
docker-php-ext-enable memcached
37-
else
38-
echo "Warning: memcached extension not available, skipping..."
39-
fi
15+
docker-php-ext-enable memcached
4016
else
4117
rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
4218
fi

‎images/5.3/cli/Dockerfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ COPY entrypoint.sh /entrypoint.sh
3232

3333
RUN chmod +x /entrypoint.sh
3434

35-
# WP CLI config
36-
ENV WP_CLI_CACHE_DIR=/tmp/wp-cli
37-
3835
ENTRYPOINT [ "/entrypoint.sh" ]
3936

4037

‎images/5.3/php/common.sh‎

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,18 @@
11
#!/bin/bash
22
set -e
33

4-
# Check if an extension is available
5-
extension_available() {
6-
local ext=$1
7-
if [ -f "/usr/local/lib/php/extensions/$(php -r 'echo PHP_EXTENSION_DIR;' | xargs basename)/${ext}.so" ]; then
8-
return 0
9-
fi
10-
return 1
11-
}
12-
134
# If LOCAL_PHP_XDEBUG=true xdebug extension will be enabled
145
if [ "$LOCAL_PHP_XDEBUG" = true ]; then
15-
if extension_available "xdebug"; then
16-
docker-php-ext-enable xdebug
17-
rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
18-
else
19-
echo "Warning: xdebug extension not available, skipping..."
20-
fi
6+
docker-php-ext-enable xdebug
7+
rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
218
else
22-
if extension_available "opcache"; then
23-
docker-php-ext-enable opcache
24-
rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
25-
else
26-
# OPcache might be built-in, check if it's already loaded
27-
if ! php -m | grep -q "Zend OPcache"; then
28-
echo "Warning: opcache extension not available, skipping..."
29-
fi
30-
fi
9+
docker-php-ext-enable opcache
10+
rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
3111
fi
3212

3313
# If LOCAL_PHP_MEMCACHED=true memcached extension will be enabled
3414
if [ "$LOCAL_PHP_MEMCACHED" = true ]; then
35-
if extension_available "memcached"; then
36-
docker-php-ext-enable memcached
37-
else
38-
echo "Warning: memcached extension not available, skipping..."
39-
fi
15+
docker-php-ext-enable memcached
4016
else
4117
rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
4218
fi

‎images/5.4/cli/Dockerfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ COPY entrypoint.sh /entrypoint.sh
3232

3333
RUN chmod +x /entrypoint.sh
3434

35-
# WP CLI config
36-
ENV WP_CLI_CACHE_DIR=/tmp/wp-cli
37-
3835
ENTRYPOINT [ "/entrypoint.sh" ]
3936

4037

‎images/5.4/php/common.sh‎

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,18 @@
11
#!/bin/bash
22
set -e
33

4-
# Check if an extension is available
5-
extension_available() {
6-
local ext=$1
7-
if [ -f "/usr/local/lib/php/extensions/$(php -r 'echo PHP_EXTENSION_DIR;' | xargs basename)/${ext}.so" ]; then
8-
return 0
9-
fi
10-
return 1
11-
}
12-
134
# If LOCAL_PHP_XDEBUG=true xdebug extension will be enabled
145
if [ "$LOCAL_PHP_XDEBUG" = true ]; then
15-
if extension_available "xdebug"; then
16-
docker-php-ext-enable xdebug
17-
rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
18-
else
19-
echo "Warning: xdebug extension not available, skipping..."
20-
fi
6+
docker-php-ext-enable xdebug
7+
rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
218
else
22-
if extension_available "opcache"; then
23-
docker-php-ext-enable opcache
24-
rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
25-
else
26-
# OPcache might be built-in, check if it's already loaded
27-
if ! php -m | grep -q "Zend OPcache"; then
28-
echo "Warning: opcache extension not available, skipping..."
29-
fi
30-
fi
9+
docker-php-ext-enable opcache
10+
rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
3111
fi
3212

3313
# If LOCAL_PHP_MEMCACHED=true memcached extension will be enabled
3414
if [ "$LOCAL_PHP_MEMCACHED" = true ]; then
35-
if extension_available "memcached"; then
36-
docker-php-ext-enable memcached
37-
else
38-
echo "Warning: memcached extension not available, skipping..."
39-
fi
15+
docker-php-ext-enable memcached
4016
else
4117
rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
4218
fi

‎images/5.5/cli/Dockerfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ COPY entrypoint.sh /entrypoint.sh
3232

3333
RUN chmod +x /entrypoint.sh
3434

35-
# WP CLI config
36-
ENV WP_CLI_CACHE_DIR=/tmp/wp-cli
37-
3835
ENTRYPOINT [ "/entrypoint.sh" ]
3936

4037

‎images/5.5/php/common.sh‎

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,18 @@
11
#!/bin/bash
22
set -e
33

4-
# Check if an extension is available
5-
extension_available() {
6-
local ext=$1
7-
if [ -f "/usr/local/lib/php/extensions/$(php -r 'echo PHP_EXTENSION_DIR;' | xargs basename)/${ext}.so" ]; then
8-
return 0
9-
fi
10-
return 1
11-
}
12-
134
# If LOCAL_PHP_XDEBUG=true xdebug extension will be enabled
145
if [ "$LOCAL_PHP_XDEBUG" = true ]; then
15-
if extension_available "xdebug"; then
16-
docker-php-ext-enable xdebug
17-
rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
18-
else
19-
echo "Warning: xdebug extension not available, skipping..."
20-
fi
6+
docker-php-ext-enable xdebug
7+
rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
218
else
22-
if extension_available "opcache"; then
23-
docker-php-ext-enable opcache
24-
rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
25-
else
26-
# OPcache might be built-in, check if it's already loaded
27-
if ! php -m | grep -q "Zend OPcache"; then
28-
echo "Warning: opcache extension not available, skipping..."
29-
fi
30-
fi
9+
docker-php-ext-enable opcache
10+
rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
3111
fi
3212

3313
# If LOCAL_PHP_MEMCACHED=true memcached extension will be enabled
3414
if [ "$LOCAL_PHP_MEMCACHED" = true ]; then
35-
if extension_available "memcached"; then
36-
docker-php-ext-enable memcached
37-
else
38-
echo "Warning: memcached extension not available, skipping..."
39-
fi
15+
docker-php-ext-enable memcached
4016
else
4117
rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
4218
fi

‎images/5.6.20/cli/Dockerfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ COPY entrypoint.sh /entrypoint.sh
3232

3333
RUN chmod +x /entrypoint.sh
3434

35-
# WP CLI config
36-
ENV WP_CLI_CACHE_DIR=/tmp/wp-cli
37-
3835
ENTRYPOINT [ "/entrypoint.sh" ]
3936

4037

‎images/5.6.20/php/common.sh‎

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,18 @@
11
#!/bin/bash
22
set -e
33

4-
# Check if an extension is available
5-
extension_available() {
6-
local ext=$1
7-
if [ -f "/usr/local/lib/php/extensions/$(php -r 'echo PHP_EXTENSION_DIR;' | xargs basename)/${ext}.so" ]; then
8-
return 0
9-
fi
10-
return 1
11-
}
12-
134
# If LOCAL_PHP_XDEBUG=true xdebug extension will be enabled
145
if [ "$LOCAL_PHP_XDEBUG" = true ]; then
15-
if extension_available "xdebug"; then
16-
docker-php-ext-enable xdebug
17-
rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
18-
else
19-
echo "Warning: xdebug extension not available, skipping..."
20-
fi
6+
docker-php-ext-enable xdebug
7+
rm -f /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
218
else
22-
if extension_available "opcache"; then
23-
docker-php-ext-enable opcache
24-
rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
25-
else
26-
# OPcache might be built-in, check if it's already loaded
27-
if ! php -m | grep -q "Zend OPcache"; then
28-
echo "Warning: opcache extension not available, skipping..."
29-
fi
30-
fi
9+
docker-php-ext-enable opcache
10+
rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
3111
fi
3212

3313
# If LOCAL_PHP_MEMCACHED=true memcached extension will be enabled
3414
if [ "$LOCAL_PHP_MEMCACHED" = true ]; then
35-
if extension_available "memcached"; then
36-
docker-php-ext-enable memcached
37-
else
38-
echo "Warning: memcached extension not available, skipping..."
39-
fi
15+
docker-php-ext-enable memcached
4016
else
4117
rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
4218
fi

‎images/5.6/cli/Dockerfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ COPY entrypoint.sh /entrypoint.sh
3232

3333
RUN chmod +x /entrypoint.sh
3434

35-
# WP CLI config
36-
ENV WP_CLI_CACHE_DIR=/tmp/wp-cli
37-
3835
ENTRYPOINT [ "/entrypoint.sh" ]
3936

4037

0 commit comments

Comments
 (0)