Skip to content

Commit

Permalink
feat: Update memcached to 3.2.0 (#138)
Browse files Browse the repository at this point in the history
  • Loading branch information
asbiin authored Oct 31, 2023
1 parent c294a69 commit d914ecd
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 17 deletions.
10 changes: 3 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,10 @@ jobs:
sed -i -e 's/FROM php/FROM i386\/php/g' "${{ matrix.release }}/${{ matrix.variant }}/Dockerfile"
- name: Update base image
if: matrix.arch == 'i386'
run: |
docker pull i386/php:${{ matrix.php-version }}-${{ matrix.variant }}
- name: Update base image
if: matrix.arch != 'i386'
run: |
docker pull php:${{ matrix.php-version }}-${{ matrix.variant }}
docker pull ${{ env.prefix }}php:${{ matrix.php-version }}-${{ matrix.variant }}
env:
prefix: ${{ (matrix.arch == 'i386') && 'i386/' || '' }}

- name: Build image ${{ matrix.release }}-${{ matrix.variant }} ${{ matrix.arch }}
run: |
Expand Down
1 change: 1 addition & 0 deletions .templates/Dockerfile-alpine.template
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ RUN set -ex; \
jpeg-dev \
gmp-dev \
libmemcached-dev \
libevent-dev \
libwebp-dev \
; \
\
Expand Down
2 changes: 2 additions & 0 deletions .templates/Dockerfile-debian.template
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ RUN set -ex; \
libjpeg62-turbo-dev \
libgmp-dev \
libmemcached-dev \
libcurl4-openssl-dev \
libevent-dev \
libmagickwand-dev \
libwebp-dev \
; \
Expand Down
4 changes: 3 additions & 1 deletion 4/apache/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ RUN set -ex; \
libjpeg62-turbo-dev \
libgmp-dev \
libmemcached-dev \
libcurl4-openssl-dev \
libevent-dev \
libmagickwand-dev \
libwebp-dev \
; \
Expand All @@ -58,7 +60,7 @@ RUN set -ex; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.22; \
pecl install memcached-3.2.0RC2; \
pecl install memcached-3.2.0; \
pecl install redis-6.0.2; \
\
docker-php-ext-enable \
Expand Down
3 changes: 2 additions & 1 deletion 4/fpm-alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ RUN set -ex; \
jpeg-dev \
gmp-dev \
libmemcached-dev \
libevent-dev \
libwebp-dev \
; \
\
Expand All @@ -50,7 +51,7 @@ RUN set -ex; \
; \
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.22; \
pecl install memcached-3.2.0RC2; \
pecl install memcached-3.2.0; \
pecl install redis-6.0.2; \
\
docker-php-ext-enable \
Expand Down
4 changes: 3 additions & 1 deletion 4/fpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ RUN set -ex; \
libjpeg62-turbo-dev \
libgmp-dev \
libmemcached-dev \
libcurl4-openssl-dev \
libevent-dev \
libmagickwand-dev \
libwebp-dev \
; \
Expand All @@ -58,7 +60,7 @@ RUN set -ex; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.22; \
pecl install memcached-3.2.0RC2; \
pecl install memcached-3.2.0; \
pecl install redis-6.0.2; \
\
docker-php-ext-enable \
Expand Down
4 changes: 3 additions & 1 deletion 5/apache/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ RUN set -ex; \
libjpeg62-turbo-dev \
libgmp-dev \
libmemcached-dev \
libcurl4-openssl-dev \
libevent-dev \
libmagickwand-dev \
libwebp-dev \
; \
Expand All @@ -58,7 +60,7 @@ RUN set -ex; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.22; \
pecl install memcached-3.2.0RC2; \
pecl install memcached-3.2.0; \
pecl install redis-6.0.2; \
\
docker-php-ext-enable \
Expand Down
3 changes: 2 additions & 1 deletion 5/fpm-alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ RUN set -ex; \
jpeg-dev \
gmp-dev \
libmemcached-dev \
libevent-dev \
libwebp-dev \
; \
\
Expand All @@ -50,7 +51,7 @@ RUN set -ex; \
; \
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.22; \
pecl install memcached-3.2.0RC2; \
pecl install memcached-3.2.0; \
pecl install redis-6.0.2; \
\
docker-php-ext-enable \
Expand Down
4 changes: 3 additions & 1 deletion 5/fpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ RUN set -ex; \
libjpeg62-turbo-dev \
libgmp-dev \
libmemcached-dev \
libcurl4-openssl-dev \
libevent-dev \
libmagickwand-dev \
libwebp-dev \
; \
Expand All @@ -58,7 +60,7 @@ RUN set -ex; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.22; \
pecl install memcached-3.2.0RC2; \
pecl install memcached-3.2.0; \
pecl install redis-6.0.2; \
\
docker-php-ext-enable \
Expand Down
8 changes: 4 additions & 4 deletions update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ echo Initialisation
apcu_version="$(
git ls-remote --tags https://github.com/krakjoe/apcu.git \
| cut -d/ -f3 \
| grep -vE -- '-rc|-b' \
| grep -viE -- 'rc|b' \
| sed -E 's/^v//' \
| sort -V \
| tail -1
Expand All @@ -60,7 +60,7 @@ echo " APCu version: $apcu_version"
memcached_version="$(
git ls-remote --tags https://github.com/php-memcached-dev/php-memcached.git \
| cut -d/ -f3 \
| grep -vE -- '-rc|-b' \
| grep -viE -- 'rc|b' \
| sed -E 's/^[rv]//' \
| sort -V \
| tail -1
Expand Down Expand Up @@ -96,10 +96,10 @@ extra=$(_template .templates/Dockerfile-extra.template)
install=$(_template .templates/Dockerfile-install.template)

if [ -n "${1:-}" ]; then
releases=( "$1" )
releases=( "$1" )
fi
if [ -n "${2:-}" ]; then
variants=( "$2" )
variants=( "$2" )
fi

for release in "${releases[@]}"; do
Expand Down

0 comments on commit d914ecd

Please sign in to comment.