Merge pull request #12 from kool-dev/fix_build

Fix Build
kool-dev · Oct 5, 2023 · b8d2fc2 · b8d2fc2
2 parents 1681431 + 5be8fb9
commit b8d2fc2
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 15 deletions.
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -1,6 +1,6 @@
 name: CI/CD
 
-on: [push, workflow_dispatch]
+on: [push, pull_request, workflow_dispatch]
 
 env:
   DOCKER_BUILDKIT: 1

diff --git a/8.0-nginx-swoole-prod/Dockerfile b/8.0-nginx-swoole-prod/Dockerfile
@@ -2,7 +2,8 @@ FROM kooldev/php:8.0-nginx-prod
 
 RUN apk add libpq libpq-dev curl-dev
 
-RUN docker-php-ext-install sockets && \
+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 && \
@@ -12,4 +13,7 @@ RUN docker-php-ext-install sockets && \
         --enable-swoole-pgsql \
         --enable-openssl      \
         --enable-sockets --enable-swoole-curl && \
-    docker-php-ext-install -j$(nproc) swoole
+    docker-php-ext-install -j$(nproc) swoole && \
+    # cleanup
+    apk del .build-deps && \
+    rm -rf /var/cache/apk/* /tmp/*
diff --git a/8.0-nginx-swoole/Dockerfile b/8.0-nginx-swoole/Dockerfile
@@ -2,7 +2,8 @@ FROM kooldev/php:8.0-nginx
 
 RUN apk add libpq libpq-dev curl-dev
 
-RUN docker-php-ext-install sockets && \
+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 && \
@@ -12,4 +13,7 @@ RUN docker-php-ext-install sockets && \
         --enable-swoole-pgsql \
         --enable-openssl      \
         --enable-sockets --enable-swoole-curl && \
-    docker-php-ext-install -j$(nproc) swoole
+    docker-php-ext-install -j$(nproc) swoole && \
+    # cleanup
+    apk del .build-deps && \
+    rm -rf /var/cache/apk/* /tmp/*
diff --git a/8.1-nginx-swoole-prod/Dockerfile b/8.1-nginx-swoole-prod/Dockerfile
@@ -2,7 +2,8 @@ FROM kooldev/php:8.1-nginx-prod
 
 RUN apk add libpq libpq-dev curl-dev
 
-RUN docker-php-ext-install sockets && \
+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 && \
@@ -12,4 +13,7 @@ RUN docker-php-ext-install sockets && \
         --enable-swoole-pgsql \
         --enable-openssl      \
         --enable-sockets --enable-swoole-curl && \
-    docker-php-ext-install -j$(nproc) swoole
+    docker-php-ext-install -j$(nproc) swoole && \
+    # cleanup
+    apk del .build-deps && \
+    rm -rf /var/cache/apk/* /tmp/*
diff --git a/8.1-nginx-swoole/Dockerfile b/8.1-nginx-swoole/Dockerfile
@@ -2,7 +2,8 @@ FROM kooldev/php:8.1-nginx
 
 RUN apk add libpq libpq-dev curl-dev
 
-RUN docker-php-ext-install sockets && \
+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 && \
@@ -12,4 +13,7 @@ RUN docker-php-ext-install sockets && \
         --enable-swoole-pgsql \
         --enable-openssl      \
         --enable-sockets --enable-swoole-curl && \
-    docker-php-ext-install -j$(nproc) swoole
+    docker-php-ext-install -j$(nproc) swoole && \
+    # cleanup
+    apk del .build-deps && \
+    rm -rf /var/cache/apk/* /tmp/*
diff --git a/8.2-nginx-swoole-prod/Dockerfile b/8.2-nginx-swoole-prod/Dockerfile
@@ -2,7 +2,8 @@ FROM kooldev/php:8.2-nginx-prod
 
 RUN apk add libpq libpq-dev curl-dev
 
-RUN docker-php-ext-install sockets && \
+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 && \
@@ -12,4 +13,7 @@ RUN docker-php-ext-install sockets && \
         --enable-swoole-pgsql \
         --enable-openssl      \
         --enable-sockets --enable-swoole-curl && \
-    docker-php-ext-install -j$(nproc) swoole
+    docker-php-ext-install -j$(nproc) swoole && \
+    # cleanup
+    apk del .build-deps && \
+    rm -rf /var/cache/apk/* /tmp/*
diff --git a/8.2-nginx-swoole/Dockerfile b/8.2-nginx-swoole/Dockerfile
@@ -2,7 +2,8 @@ FROM kooldev/php:8.2-nginx
 
 RUN apk add libpq libpq-dev curl-dev
 
-RUN docker-php-ext-install sockets && \
+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 && \
@@ -12,4 +13,7 @@ RUN docker-php-ext-install sockets && \
         --enable-swoole-pgsql \
         --enable-openssl      \
         --enable-sockets --enable-swoole-curl && \
-    docker-php-ext-install -j$(nproc) swoole
+    docker-php-ext-install -j$(nproc) swoole && \
+    # cleanup
+    apk del .build-deps && \
+    rm -rf /var/cache/apk/* /tmp/*
diff --git a/kool.yml b/kool.yml
@@ -7,3 +7,5 @@ scripts:
     - docker build --pull -t kooldev/php:8.0-nginx-swoole-prod 8.0-nginx-swoole-prod
     - docker build --pull -t kooldev/php:8.1-nginx-swoole 8.1-nginx-swoole
     - docker build --pull -t kooldev/php:8.1-nginx-swoole-prod 8.1-nginx-swoole-prod
+    - docker build --pull -t kooldev/php:8.2-nginx-swoole 8.2-nginx-swoole
+    - docker build --pull -t kooldev/php:8.2-nginx-swoole-prod 8.2-nginx-swoole-prod
diff --git a/template/Dockerfile.blade.php b/template/Dockerfile.blade.php
@@ -2,7 +2,8 @@
 
 RUN apk add libpq libpq-dev curl-dev
 
-RUN docker-php-ext-install sockets && \
+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 && \
@@ -12,4 +13,7 @@
         --enable-swoole-pgsql \
         --enable-openssl      \
         --enable-sockets --enable-swoole-curl && \
-    docker-php-ext-install -j$(nproc) swoole
+    docker-php-ext-install -j$(nproc) swoole && \
+    # cleanup
+    apk del .build-deps && \
+    rm -rf /var/cache/apk/* /tmp/*