Skip to content

Commit b8d2fc2

Browse files
authored
Merge pull request #12 from kool-dev/fix_build
Fix Build
2 parents 1681431 + 5be8fb9 commit b8d2fc2

File tree

9 files changed

+45
-15
lines changed

9 files changed

+45
-15
lines changed

.github/workflows/ci-cd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: CI/CD
22

3-
on: [push, workflow_dispatch]
3+
on: [push, pull_request, workflow_dispatch]
44

55
env:
66
DOCKER_BUILDKIT: 1

8.0-nginx-swoole-prod/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ FROM kooldev/php:8.0-nginx-prod
22

33
RUN apk add libpq libpq-dev curl-dev
44

5-
RUN docker-php-ext-install sockets && \
5+
RUN apk add --no-cache --virtual .build-deps linux-headers && \
6+
docker-php-ext-install sockets && \
67
docker-php-source extract && \
78
mkdir /usr/src/php/ext/swoole && \
89
curl -sfL https://github.com/swoole/swoole-src/archive/v5.1.0.tar.gz -o swoole.tar.gz && \
@@ -12,4 +13,7 @@ RUN docker-php-ext-install sockets && \
1213
--enable-swoole-pgsql \
1314
--enable-openssl \
1415
--enable-sockets --enable-swoole-curl && \
15-
docker-php-ext-install -j$(nproc) swoole
16+
docker-php-ext-install -j$(nproc) swoole && \
17+
# cleanup
18+
apk del .build-deps && \
19+
rm -rf /var/cache/apk/* /tmp/*

8.0-nginx-swoole/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ FROM kooldev/php:8.0-nginx
22

33
RUN apk add libpq libpq-dev curl-dev
44

5-
RUN docker-php-ext-install sockets && \
5+
RUN apk add --no-cache --virtual .build-deps linux-headers && \
6+
docker-php-ext-install sockets && \
67
docker-php-source extract && \
78
mkdir /usr/src/php/ext/swoole && \
89
curl -sfL https://github.com/swoole/swoole-src/archive/v5.1.0.tar.gz -o swoole.tar.gz && \
@@ -12,4 +13,7 @@ RUN docker-php-ext-install sockets && \
1213
--enable-swoole-pgsql \
1314
--enable-openssl \
1415
--enable-sockets --enable-swoole-curl && \
15-
docker-php-ext-install -j$(nproc) swoole
16+
docker-php-ext-install -j$(nproc) swoole && \
17+
# cleanup
18+
apk del .build-deps && \
19+
rm -rf /var/cache/apk/* /tmp/*

8.1-nginx-swoole-prod/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ FROM kooldev/php:8.1-nginx-prod
22

33
RUN apk add libpq libpq-dev curl-dev
44

5-
RUN docker-php-ext-install sockets && \
5+
RUN apk add --no-cache --virtual .build-deps linux-headers && \
6+
docker-php-ext-install sockets && \
67
docker-php-source extract && \
78
mkdir /usr/src/php/ext/swoole && \
89
curl -sfL https://github.com/swoole/swoole-src/archive/v5.1.0.tar.gz -o swoole.tar.gz && \
@@ -12,4 +13,7 @@ RUN docker-php-ext-install sockets && \
1213
--enable-swoole-pgsql \
1314
--enable-openssl \
1415
--enable-sockets --enable-swoole-curl && \
15-
docker-php-ext-install -j$(nproc) swoole
16+
docker-php-ext-install -j$(nproc) swoole && \
17+
# cleanup
18+
apk del .build-deps && \
19+
rm -rf /var/cache/apk/* /tmp/*

8.1-nginx-swoole/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ FROM kooldev/php:8.1-nginx
22

33
RUN apk add libpq libpq-dev curl-dev
44

5-
RUN docker-php-ext-install sockets && \
5+
RUN apk add --no-cache --virtual .build-deps linux-headers && \
6+
docker-php-ext-install sockets && \
67
docker-php-source extract && \
78
mkdir /usr/src/php/ext/swoole && \
89
curl -sfL https://github.com/swoole/swoole-src/archive/v5.1.0.tar.gz -o swoole.tar.gz && \
@@ -12,4 +13,7 @@ RUN docker-php-ext-install sockets && \
1213
--enable-swoole-pgsql \
1314
--enable-openssl \
1415
--enable-sockets --enable-swoole-curl && \
15-
docker-php-ext-install -j$(nproc) swoole
16+
docker-php-ext-install -j$(nproc) swoole && \
17+
# cleanup
18+
apk del .build-deps && \
19+
rm -rf /var/cache/apk/* /tmp/*

8.2-nginx-swoole-prod/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ FROM kooldev/php:8.2-nginx-prod
22

33
RUN apk add libpq libpq-dev curl-dev
44

5-
RUN docker-php-ext-install sockets && \
5+
RUN apk add --no-cache --virtual .build-deps linux-headers && \
6+
docker-php-ext-install sockets && \
67
docker-php-source extract && \
78
mkdir /usr/src/php/ext/swoole && \
89
curl -sfL https://github.com/swoole/swoole-src/archive/v5.1.0.tar.gz -o swoole.tar.gz && \
@@ -12,4 +13,7 @@ RUN docker-php-ext-install sockets && \
1213
--enable-swoole-pgsql \
1314
--enable-openssl \
1415
--enable-sockets --enable-swoole-curl && \
15-
docker-php-ext-install -j$(nproc) swoole
16+
docker-php-ext-install -j$(nproc) swoole && \
17+
# cleanup
18+
apk del .build-deps && \
19+
rm -rf /var/cache/apk/* /tmp/*

8.2-nginx-swoole/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ FROM kooldev/php:8.2-nginx
22

33
RUN apk add libpq libpq-dev curl-dev
44

5-
RUN docker-php-ext-install sockets && \
5+
RUN apk add --no-cache --virtual .build-deps linux-headers && \
6+
docker-php-ext-install sockets && \
67
docker-php-source extract && \
78
mkdir /usr/src/php/ext/swoole && \
89
curl -sfL https://github.com/swoole/swoole-src/archive/v5.1.0.tar.gz -o swoole.tar.gz && \
@@ -12,4 +13,7 @@ RUN docker-php-ext-install sockets && \
1213
--enable-swoole-pgsql \
1314
--enable-openssl \
1415
--enable-sockets --enable-swoole-curl && \
15-
docker-php-ext-install -j$(nproc) swoole
16+
docker-php-ext-install -j$(nproc) swoole && \
17+
# cleanup
18+
apk del .build-deps && \
19+
rm -rf /var/cache/apk/* /tmp/*

kool.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ scripts:
77
- docker build --pull -t kooldev/php:8.0-nginx-swoole-prod 8.0-nginx-swoole-prod
88
- docker build --pull -t kooldev/php:8.1-nginx-swoole 8.1-nginx-swoole
99
- docker build --pull -t kooldev/php:8.1-nginx-swoole-prod 8.1-nginx-swoole-prod
10+
- docker build --pull -t kooldev/php:8.2-nginx-swoole 8.2-nginx-swoole
11+
- docker build --pull -t kooldev/php:8.2-nginx-swoole-prod 8.2-nginx-swoole-prod

template/Dockerfile.blade.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
RUN apk add libpq libpq-dev curl-dev
44

5-
RUN docker-php-ext-install sockets && \
5+
RUN apk add --no-cache --virtual .build-deps linux-headers && \
6+
docker-php-ext-install sockets && \
67
docker-php-source extract && \
78
mkdir /usr/src/php/ext/swoole && \
89
curl -sfL https://github.com/swoole/swoole-src/archive/v5.1.0.tar.gz -o swoole.tar.gz && \
@@ -12,4 +13,7 @@
1213
--enable-swoole-pgsql \
1314
--enable-openssl \
1415
--enable-sockets --enable-swoole-curl && \
15-
docker-php-ext-install -j$(nproc) swoole
16+
docker-php-ext-install -j$(nproc) swoole && \
17+
# cleanup
18+
apk del .build-deps && \
19+
rm -rf /var/cache/apk/* /tmp/*

0 commit comments

Comments
 (0)