Skip to content

Commit

Permalink
upgrade to Swoole 5.1.0
Browse files Browse the repository at this point in the history
Signed-off-by: Demin Yin <deminy@deminy.net>
  • Loading branch information
deminy committed Oct 3, 2023
1 parent b82f7d8 commit dea2442
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 14 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/build_docker_images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,4 @@ jobs:
context: ./dockerfiles/${{ matrix.type }}/
platforms: linux/amd64
push: true
tags: deminy/swoole-by-examples:${{ matrix.type }}-5.0

-
name: Image Digest of deminy/swoole-by-examples:${{ steps.params.outputs.docker_tag }}
run: echo ${{ steps.docker_build.outputs.digest }}
tags: deminy/swoole-by-examples:${{ matrix.type }}-5.1
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3'

services:
server:
image: deminy/swoole-by-examples:server-5.0
image: deminy/swoole-by-examples:server-5.1
environment:
AUTORELOAD_PROGRAMS: "ddos-protection http1 http1-integrated http2 keepalive mixed-protocols-1 pool-msgqueue pool-tcp-socket pool-unix-socket redis rock-paper-scissors tcp1 tcp2 udp websocket websocket-integrated"
DISABLE_DEFAULT_SERVER: 1
Expand All @@ -11,7 +11,7 @@ services:
volumes:
- ./examples:/var/www
client:
image: deminy/swoole-by-examples:client-5.0
image: deminy/swoole-by-examples:client-5.1
environment:
DISABLE_DEFAULT_SERVER: 1
links:
Expand Down
11 changes: 5 additions & 6 deletions dockerfiles/client/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
# This Dockerfile is to build Docker image "deminy/swoole-by-examples:client".
# @see https://hub.docker.com/r/deminy/swoole-by-examples
FROM phpswoole/swoole:5.0
FROM phpswoole/swoole:5.1

RUN \
set -ex && \
docker-php-ext-install mysqli && \
apt-get update && \
apt-get install -y apache2-utils netcat xxd --no-install-recommends && \
curl -sfL -o websocat.deb https://github.com/vi/websocat/releases/download/v1.5.0/websocat_1.5.0_ssl1.1_amd64.deb && \
dpkg -i websocat.deb && \
rm -rf websocat.deb /var/lib/apt/lists/* && \
composer require -d ${HOME} -n predis/predis:~1.1.0 && \
apt-get install -y apache2-utils netcat-traditional xxd --no-install-recommends && \
curl -sfL -o /usr/bin/websocat "https://github.com/vi/websocat/releases/download/v1.12.0/websocat.$(uname -m)-unknown-linux-musl" && \
rm -rf /var/lib/apt/lists/* && \
composer require -d ${HOME} -n predis/predis:~2.2.0 && \
composer clearcache
2 changes: 1 addition & 1 deletion dockerfiles/server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This Dockerfile is to build Docker image "deminy/swoole-by-examples:server".
# @see https://hub.docker.com/r/deminy/swoole-by-examples
FROM phpswoole/swoole:5.0
FROM phpswoole/swoole:5.1

COPY ./rootfilesystem /

Expand Down

0 comments on commit dea2442

Please sign in to comment.