@wocker/ws 1.0.6 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wocker/ws",
-    "version": "1.0.6",
+    "version": "1.0.7",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Docker workspace for web projects",
     "license": "MIT",
@@ -44,7 +44,7 @@
         "reflect-metadata": "^0.2.1"
     },
     "devDependencies": {
-        "@types/dockerode": "^3.3.23",
+        "@types/dockerode": "3.3.23",
         "@types/inquirer": "^7.0.0",
         "@types/jest": "^29.5.12",
         "@types/lodash": "^4.14.161",
@@ -58,6 +58,6 @@
         "eslint-plugin-import": "^2.28.1",
         "eslint-plugin-node": "^11.1.0",
         "eslint-webpack-plugin": "^3.1.0",
-        "typescript": "^5.3.3"
+        "typescript": "^5.4.2"
     }
 }

package/presets/php-apache/Dockerfile

@@ -117,6 +117,7 @@ RUN if [ "$PCNTL_ENABLE" = "true" ]; then \
         docker-php-ext-enable pcntl; \
     fi
 
+# Soap
 ARG SOAP_ENABLE=false
 RUN if [ "$SOAP_ENABLE" = "true" ]; then \
         apt-get update && apt-get install -y \
@@ -125,10 +126,33 @@ RUN if [ "$SOAP_ENABLE" = "true" ]; then \
         docker-php-ext-enable soap; \
     fi
 
+# XDebug
 ARG XDEBUG_ENABLE=false
 RUN if [ "$XDEBUG_ENABLE" = "true" ]; then \
         pecl install xdebug && \
         docker-php-ext-enable xdebug; \
+    fi \
+
+# Gettext
+ARG GETTEXT_ENABLE=false
+RUN if [ "$GETTEXT_ENABLE" = "true" ]; then \
+        apt-get update && apt-get install -y gettext && \
+        docker-php-ext-install -j "$(nproc)" gettext && \
+        docker-php-ext-enable gettext; \
+    fi
+
+# Bcmath
+ARG BCMATH_ENABLE=false
+RUN if [ "$BCMATH_ENABLE" = "true" ]; then \
+        docker-php-ext-install -j "$(nproc)" bcmath && \
+        docker-php-ext-enable bcmath; \
+    fi
+
+# Sockets
+ARG SOCKETS_ENABLE=false
+RUN if [ "$SOCKETS_ENABLE" = "true" ]; then \
+        docker-php-ext-install sockets && \
+        docker-php-ext-enable sockets; \
     fi
 
 #RUN compare-version $PHP_VERSION "7.3" && \

package/presets/php-apache/config.json

@@ -29,7 +29,10 @@
                 "INTL_ENABLE": "Intl",
                 "PCNTL_ENABLE": "Pcntl",
                 "SOAP_ENABLE": "Soap",
-                "XDEBUG_ENABLE": "XDebug"
+                "XDEBUG_ENABLE": "XDebug",
+                "GETTEXT_ENABLE": "GetText",
+                "BCMATH_ENABLE": "Bcmath",
+                "SOCKETS_ENABLE": "Sockets"
             }
         },
         "COMPOSER_ENABLE": {

package/presets/php-fpm/Dockerfile

@@ -2,20 +2,172 @@ ARG PHP_VERSION
 
 FROM php:${PHP_VERSION}-fpm
 
-#RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
+# WS Tools
+ADD ./bin/compare-version /usr/local/bin/compare-version
+RUN chmod +x /usr/local/bin/compare-version
 
-#RUN touch /usr/local/bin/docker-entrypoint && \
-#    echo "#!/bin/sh" >> /usr/local/bin/docker-entrypoint && \
-#    echo "" >> /usr/local/bin/docker-entrypoint && \
-#    echo "exec docker-php-entrypoint \"\$@\"" >> /usr/local/bin/docker-entrypoint && \
-#    chmod 775 /usr/local/bin/docker-entrypoint && \
-#    chmod +x /usr/local/bin/docker-entrypoint
+RUN apt-get update --fix-missing -y && \
+    apt-get install -y curl git nginx && \
+    chown -R www-data:www-data /var/lib/nginx
 
-#ENV WORKDIR /var/www/html
-WORKDIR /var/www/html
+# Http
+ARG HTTP_ENABLE=false
+RUN if [ "$HTTP_ENABLE" = "true" ]; then \
+        apt-get update && apt-get install -y \
+            libpcre3-dev \
+            libssl-dev \
+            libcurl4-openssl-dev \
+            libicu-dev \
+            g++ \
+            zlib1g-dev && \
+        docker-php-ext-install pcntl && \
+        pecl install raphf && docker-php-ext-enable raphf && \
+        pecl install pecl_http && docker-php-ext-enable http; \
+    fi
 
-EXPOSE 9000
+# Mysqli
+ARG MYSQLI_ENABLE=false
+RUN if [ "$MYSQLI_ENABLE" = "true" ]; then \
+        docker-php-ext-install -j "$(nproc)" mysqli && \
+        docker-php-ext-enable mysqli; \
+    fi
+
+# pdo
+ARG PDO_MYSQL_ENABLE=false
+RUN if [ "$PDO_MYSQL_ENABLE" = "true" ]; then \
+        docker-php-ext-install pdo pdo_mysql &&  \
+        docker-php-ext-enable pdo_mysql; \
+    fi
+
+# pgsql
+ARG PGSQL_ENABLE=false
+RUN if [ "$PGSQL_ENABLE" = "true" ]; then \
+    apt-get install -y libpq-dev && \
+    docker-php-ext-install -j "$(nproc)" pgsql pdo_pgsql && \
+    docker-php-ext-enable pgsql pdo_pgsql; \
+fi
+
+#gd
+ARG GD_ENABLE=false
+RUN if [ "$GD_ENABLE" = "true" ]; then \
+        apt-get update && apt-get install -y \
+            libfreetype6-dev \
+            libjpeg62-turbo-dev \
+            libpng-dev && \
+        compare-version $PHP_VERSION "7.3" && \
+            docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include || \
+            docker-php-ext-configure gd --with-freetype --with-jpeg && \
+        docker-php-ext-install -j$(nproc) gd && \
+        docker-php-ext-install exif; \
+    fi
+
+# Zip
+ARG ZIP_ENABLE=false
+RUN if [ "$ZIP_ENABLE" = "true" ]; then \
+        apt-get install -y libzip-dev zip unzip && \
+        docker-php-ext-configure zip && \
+        docker-php-ext-install -j "$(nproc)" zip; \
+    fi
+
+# memcache
+ARG MEMCACHE_ENABLE=false
+RUN if [ "$MEMCACHE_ENABLE" = "true" ]; then \
+        apt-get update && apt-get install -y \
+            zlib1g-dev \
+            libmemcached-dev && \
+        pecl install memcache && docker-php-ext-enable memcache; \
+    fi
+
+# memcached
+ARG MEMCACHED_ENABLE=false
+RUN if [ "$MEMCACHED_ENABLE" = "true" ]; then \
+        apt-get update && apt-get install -y \
+            libcurl4-openssl-dev  \
+            libssl-dev \
+            libmemcached-dev \
+            zlib1g-dev && \
+        pecl install memcached && docker-php-ext-enable memcached; \
+    fi
+
+# Intl
+ARG INTL_ENABLE=false
+RUN if [ "$INTL_ENABLE" = "true" ]; then \
+        apt-get update && apt-get install -y \
+            libicu-dev && \
+        docker-php-ext-configure intl && \
+        docker-php-ext-install intl; \
+    fi
+
+# Pcntl
+ARG PCNTL_ENABLE=false
+RUN if [ "$PCNTL_ENABLE" = "true" ]; then \
+        docker-php-ext-install pcntl && \
+        docker-php-ext-enable pcntl; \
+    fi
+
+# Soap
+ARG SOAP_ENABLE=false
+RUN if [ "$SOAP_ENABLE" = "true" ]; then \
+        apt-get update && apt-get install -y \
+            libxml2-dev && \
+        docker-php-ext-install soap && \
+        docker-php-ext-enable soap; \
+    fi
 
+# XDebug
+ARG XDEBUG_ENABLE=false
+RUN if [ "$XDEBUG_ENABLE" = "true" ]; then \
+        pecl install xdebug && \
+        docker-php-ext-enable xdebug; \
+    fi
+
+# Gettext
+ARG GETTEXT_ENABLE=false
+RUN if [ "$GETTEXT_ENABLE" = "true" ]; then \
+        apt-get update && apt-get install -y gettext && \
+        docker-php-ext-install -j "$(nproc)" gettext && \
+        docker-php-ext-enable gettext; \
+    fi
+
+# Bcmath
+ARG BCMATH_ENABLE=false
+RUN if [ "$BCMATH_ENABLE" = "true" ]; then \
+        docker-php-ext-install -j "$(nproc)" bcmath && \
+        docker-php-ext-enable bcmath; \
+    fi
+
+# Sockets
+ARG SOCKETS_ENABLE=false
+RUN if [ "$SOCKETS_ENABLE" = "true" ]; then \
+        docker-php-ext-install sockets && \
+        docker-php-ext-enable sockets; \
+    fi
+
+# Composer
+ARG COMPOSER_ENABLE=false
+
+SHELL ["/bin/bash", "-c"]
+RUN if [ "$COMPOSER_ENABLE" = "true" ]; then \
+        apt-get update && \
+            apt-get install -y bash-completion; \
+        echo "source /etc/bash_completion" >> /home/$USER/.bashrc; \
+        mkdir -p /home/$USER/.composer; \
+        curl -sL https://getcomposer.org/installer | php && \
+        mv composer.phar /usr/local/bin/composer && \
+        chmod +x /usr/local/bin/composer; \
+        echo ". <(composer completion bash)" >> /home/$USER/.bashrc; \
+    fi
+SHELL ["/bin/sh", "-c"]
+
+ARG WORKDIR=/var/www
+ARG NGINX_DOCUMENT_ROOT=/var/www
+WORKDIR $WORKDIR
+
+ADD etc/nginx/sites-available/default.conf /tmp/default.conf.txt
+RUN envsubst '\${NGINX_DOCUMENT_ROOT}' < /tmp/default.conf.txt > /etc/nginx/sites-available/default.conf
+
+EXPOSE 80
+EXPOSE 9000
 
-#ENTRYPOINT ["docker-entrypoint"]
-CMD ["php-fpm"]
+#CMD ["nginx", "-g", "daemon off;"]
+CMD service nginx start && php-fpm

package/presets/php-fpm/bin/compare-version

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+printf '%s\n%s\n' "$2" "$1" | sort --check=quiet --version-sort

package/presets/php-fpm/config.json

@@ -10,16 +10,45 @@
                 "8.1",
                 "8.2"
             ]
-        }
-    },
-    "envOptions": {
+        },
+        "EXTENSIONS": {
+            "type": "select",
+            "multiple": true,
+            "message": "Extensions",
+            "options": {
+                "MYSQLI_ENABLE": "Mysqli",
+                "PDO_MYSQL_ENABLE": "PDO",
+                "PGSQL_ENABLE": "Pgsql",
+                "GD_ENABLE": "GD",
+                "ZIP_ENABLE": "Zip",
+                "MEMCACHE_ENABLE": "Memcache",
+                "MEMCACHED_ENABLE": "Memcached",
+                "HTTP_ENABLE": "Raphf+Http",
+                "INTL_ENABLE": "Intl",
+                "PCNTL_ENABLE": "Pcntl",
+                "SOAP_ENABLE": "Soap",
+                "XDEBUG_ENABLE": "XDebug",
+                "GETTEXT_ENABLE": "GetText",
+                "BCMATH_ENABLE": "Bcmath",
+                "SOCKETS_ENABLE": "Sockets"
+            }
+        },
+        "COMPOSER_ENABLE": {
+            "message": "Install composer?",
+            "type": "boolean"
+        },
         "WORKDIR": {
             "type": "string",
             "message": "Workdir",
-            "default": "/var/www/html"
+            "default": "/var/www"
+        },
+        "NGINX_DOCUMENT_ROOT": {
+            "type": "string",
+            "message": "Nginx document root",
+            "default": "/var/www"
         }
     },
     "volumeOptions": [
-        "./:/var/www/html"
+        "./:/var/www"
     ]
 }

package/presets/php-fpm/etc/nginx/sites-available/default.conf

@@ -0,0 +1,36 @@
+server {
+    listen 80 default_server;
+    root ${NGINX_DOCUMENT_ROOT};
+
+    index index.php index.html index.htm;
+
+    server_name _;
+
+    if ($request_uri ~ "index\.(php|htm|html|asp|cfm|jsp)") {
+        rewrite ^(.*/).*$ $1 permanent;
+    }
+
+    location / {
+        try_files $uri $uri/ @rew;
+    }
+
+    location @rew {
+      rewrite ^(.*)$ /index.php last;
+    }
+
+    location ~ \.php$ {
+        include fastcgi.conf;
+        include fastcgi_params;
+        fastcgi_read_timeout 30s;
+        try_files $uri /index.php;
+        fastcgi_param SCRIPT_FILENAME $request_filename;
+        fastcgi_pass 127.0.0.1:9000;
+    }
+
+    # deny access to .htaccess files, if Apache's document root
+    # concurs with nginx's one
+    #
+    location ~ /\.(ht|env|git|ide)* {
+        return 404;
+    }
+}