From 43a5fb4bd3797baff362ccd0a0a7262b207b3486 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Tue, 7 Dec 2021 23:46:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9php=E5=AE=B9=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml        |  2 +-
 docker/php/php.Dockerfile | 55 ---------------------------------------
 2 files changed, 1 insertion(+), 56 deletions(-)
 delete mode 100644 docker/php/php.Dockerfile

diff --git a/docker-compose.yml b/docker-compose.yml
index 89bfd8f3..676a1eaf 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
   php:
     container_name: "dooteak-php-${DOCKER_ID}"
-    image: "kuaifan/dootaskphp:8.0"
+    image: "kuaifan/phpswoole:8.0"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - ./docker/crontab/crontab.conf:/etc/supervisor/conf.d/crontab.conf
diff --git a/docker/php/php.Dockerfile b/docker/php/php.Dockerfile
deleted file mode 100644
index 91f4b21d..00000000
--- a/docker/php/php.Dockerfile
+++ /dev/null
@@ -1,55 +0,0 @@
-FROM --platform=$TARGETPLATFORM phpswoole/swoole:php8.0
-
-# Installation dependencies and PHP core extensions
-RUN apt-get update \
-        && apt-get -y install --no-install-recommends --assume-yes \
-        libpng-dev \
-        libzip-dev \
-        libzip4 \
-        zip \
-        unzip \
-        git \
-        net-tools \
-        iputils-ping \
-        vim \
-        supervisor \
-        sudo \
-        curl \
-        dirmngr \
-        apt-transport-https \
-        lsb-release \
-        ca-certificates \
-        libjpeg-dev \
-        libfreetype6-dev \
-        inotify-tools \
-        sshpass \
-        cron
-
-RUN curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash - \
-        && apt-get -y install nodejs
-
-RUN docker-php-ext-configure gd --with-freetype --with-jpeg \
-        && docker-php-ext-install pdo_mysql gd pcntl zip
-
-RUN mkdir -p /usr/src/php/ext/redis \
-        && curl -L https://github.com/phpredis/phpredis/archive/5.3.2.tar.gz | tar xvz -C /usr/src/php/ext/redis --strip 1 \
-        && echo 'redis' >> /usr/src/php-available-exts \
-        && docker-php-ext-install redis
-
-RUN echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list \
-        && echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu trusty main" >> /etc/apt/sources.list \
-        && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367 \
-        && apt-get update \
-        && apt-get install -y wireguard openresolv ansible openssh-client
-
-RUN echo "* * * * * sh /var/www/docker/crontab/crontab.sh" > /tmp/crontab \
-        && crontab /tmp/crontab \
-        && rm -rf /tmp/crontab
-
-RUN rm -r /var/lib/apt/lists/*
-
-WORKDIR /var/www
-
-# docker buildx create --use
-# docker buildx build --platform linux/arm64,linux/amd64 -t kuaifan/dootaskphp:8.0 --push -f ./php.Dockerfile .
-# 需要 docker login 到 docker hub, 用户名 (docker id): kuaifan