Skip to content

Commit

Permalink
Merge pull request #14 from kool-dev/add-83
Browse files Browse the repository at this point in the history
add 8.3 + tweak readme
  • Loading branch information
dbpolito authored Mar 24, 2024
2 parents f1b206b + 64b97e0 commit 45c495f
Show file tree
Hide file tree
Showing 6 changed files with 76 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
version: ['8.0', '8.1', '8.2']
version: ['8.0', '8.1', '8.2', '8.3']
type: ['-swoole', '-nginx-swoole-prod']

steps:
Expand Down
19 changes: 19 additions & 0 deletions 8.3-nginx-swoole-prod/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
FROM kooldev/php:8.3-nginx-prod

RUN apk add libpq libpq-dev curl-dev

RUN apk add --no-cache --virtual .build-deps linux-headers && \
docker-php-ext-install sockets && \
docker-php-source extract && \
mkdir /usr/src/php/ext/swoole && \
curl -sfL https://github.com/swoole/swoole-src/archive/v5.1.0.tar.gz -o swoole.tar.gz && \
tar xfz swoole.tar.gz --strip-components=1 -C /usr/src/php/ext/swoole && \
docker-php-ext-configure swoole \
--enable-mysqlnd \
--enable-swoole-pgsql \
--enable-openssl \
--enable-sockets --enable-swoole-curl && \
docker-php-ext-install -j$(nproc) swoole && \
# cleanup
apk del .build-deps && \
rm -rf /var/cache/apk/* /tmp/*
19 changes: 19 additions & 0 deletions 8.3-swoole/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
FROM kooldev/php:8.3-node

RUN apk add libpq libpq-dev curl-dev

RUN apk add --no-cache --virtual .build-deps linux-headers && \
docker-php-ext-install sockets && \
docker-php-source extract && \
mkdir /usr/src/php/ext/swoole && \
curl -sfL https://github.com/swoole/swoole-src/archive/v5.1.0.tar.gz -o swoole.tar.gz && \
tar xfz swoole.tar.gz --strip-components=1 -C /usr/src/php/ext/swoole && \
docker-php-ext-configure swoole \
--enable-mysqlnd \
--enable-swoole-pgsql \
--enable-openssl \
--enable-sockets --enable-swoole-curl && \
docker-php-ext-install -j$(nproc) swoole && \
# cleanup
apk del .build-deps && \
rm -rf /var/cache/apk/* /tmp/*
17 changes: 10 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,25 @@ This image is based on [kooldev/php](https://github.com/kool-dev/docker-php), pl

## Available Tags

### 8.0
### 8.3

- [8.0-swoole](https://github.com/kool-dev/docker-php-swoole/blob/main/8.0-swoole/Dockerfile)
- [8.0-nginx-swoole-prod](https://github.com/kool-dev/docker-php-swoole/blob/main/8.0-nginx-swoole-prod/Dockerfile)
- [8.3-swoole](https://github.com/kool-dev/docker-php-swoole/blob/main/8.3-swoole/Dockerfile)
- [8.3-nginx-swoole-prod](https://github.com/kool-dev/docker-php-swoole/blob/main/8.3-nginx-swoole-prod/Dockerfile)

### 8.2

- [8.2-swoole](https://github.com/kool-dev/docker-php-swoole/blob/main/8.2-swoole/Dockerfile)
- [8.2-nginx-swoole-prod](https://github.com/kool-dev/docker-php-swoole/blob/main/8.2-nginx-swoole-prod/Dockerfile)

### 8.1

- [8.1-swoole](https://github.com/kool-dev/docker-php-swoole/blob/main/8.1-swoole/Dockerfile)
- [8.1-nginx-swoole-prod](https://github.com/kool-dev/docker-php-swoole/blob/main/8.1-nginx-swoole-prod/Dockerfile)

### 8.2

- [8.2-swoole](https://github.com/kool-dev/docker-php-swoole/blob/main/8.2-swoole/Dockerfile)
- [8.2-nginx-swoole-prod](https://github.com/kool-dev/docker-php-swoole/blob/main/8.2-nginx-swoole-prod/Dockerfile)
### 8.0

- [8.0-swoole](https://github.com/kool-dev/docker-php-swoole/blob/main/8.0-swoole/Dockerfile)
- [8.0-nginx-swoole-prod](https://github.com/kool-dev/docker-php-swoole/blob/main/8.0-nginx-swoole-prod/Dockerfile)

## Environment Variables

Expand Down
25 changes: 25 additions & 0 deletions fwd-template.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,31 @@
"path": "template/Dockerfile"
}
]
},

{
"name": "8.3-swoole",
"data": {
"from": "kooldev/php:8.3-node"
},
"files": [
{
"name": "Dockerfile",
"path": "template/Dockerfile"
}
]
},
{
"name": "8.3-nginx-swoole-prod",
"data": {
"from": "kooldev/php:8.3-nginx-prod"
},
"files": [
{
"name": "Dockerfile",
"path": "template/Dockerfile"
}
]
}
]
}
2 changes: 2 additions & 0 deletions kool.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ scripts:
- docker build --pull -t kooldev/php:8.1-nginx-swoole-prod 8.1-nginx-swoole-prod
- docker build --pull -t kooldev/php:8.2-swoole 8.2-swoole
- docker build --pull -t kooldev/php:8.2-nginx-swoole-prod 8.2-nginx-swoole-prod
- docker build --pull -t kooldev/php:8.3-swoole 8.3-swoole
- docker build --pull -t kooldev/php:8.3-nginx-swoole-prod 8.3-nginx-swoole-prod

0 comments on commit 45c495f

Please sign in to comment.