From f0c116259add1b109a80347ac4616311a6a4ef58 Mon Sep 17 00:00:00 2001 From: k911 Date: Sat, 2 Jan 2021 16:17:07 +0100 Subject: [PATCH] chore(swoole): upgrade swoole extension to v4.5.10 --- .circleci/config.yml | 4 ++-- .travis.yml | 2 +- Dockerfile | 4 ++-- docker-compose.yml | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 83f67eb3..3e70f2f7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,12 +4,12 @@ orbs: executors: k911-docker-client: docker: - - image: k911/docker-client:19.03.13-compose + - image: k911/docker-client:20.10.1-compose working_directory: ~/workdir k911-release-version: docker: - - image: docker.io/k911/release-version-script:0.3.1 + - image: docker.io/k911/release-version-script:0.3.3 working_directory: /usr/src/app aliases: diff --git a/.travis.yml b/.travis.yml index 3dd15b41..976fff62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ cache: env: global: - COMPOSER_ARGS=install - - SWOOLE_VERSION=4.5.9 + - SWOOLE_VERSION=4.5.10 matrix: include: diff --git a/Dockerfile b/Dockerfile index 48d2ceb7..82c31064 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_TAG="7.4-cli-alpine3.12" -ARG COMPOSER_TAG="2.0.7" +ARG COMPOSER_TAG="2.0.8" FROM php:$PHP_TAG as ext-builder RUN docker-php-source extract && \ @@ -22,7 +22,7 @@ RUN pecl install xdebug && \ FROM ext-builder as ext-swoole RUN apk add --no-cache git -ARG SWOOLE_VERSION="4.5.9" +ARG SWOOLE_VERSION="4.5.10" RUN if $(echo "$SWOOLE_VERSION" | grep -qE '^[4-9]\.[0-9]+\.[0-9]+$'); then SWOOLE_GIT_REF="v$SWOOLE_VERSION"; else SWOOLE_GIT_REF="$SWOOLE_VERSION"; fi && \ git clone https://github.com/swoole/swoole-src.git --branch "$SWOOLE_GIT_REF" --depth 1 && \ cd swoole-src && \ diff --git a/docker-compose.yml b/docker-compose.yml index 879bd884..b0c24671 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,11 +1,11 @@ -version: "3.6" +version: "3.8" x-env-aliases: - &DEFAULT_BUILD_ARGS PHP_TAG: "${PHP_VERSION:-7.4}-cli-alpine${ALPINE_VERSION:-3.12}" PHP_API_VERSION: "${PHP_API_VERSION:-20190902}" COMPOSER_ARGS: "${COMPOSER_ARGS:-install}" - SWOOLE_VERSION: "${SWOOLE_VERSION:-4.5.9}" - COMPOSER_TAG: "${COMPOSER_TAG:-2.0.7}" + SWOOLE_VERSION: "${SWOOLE_VERSION:-4.5.10}" + COMPOSER_TAG: "${COMPOSER_TAG:-2.0.8}" volumes: coverage: {}