@wocker/ws 1.0.4 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wocker/ws",
-    "version": "1.0.4",
+    "version": "1.0.5",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Docker workspace for web projects",
     "license": "MIT",
@@ -29,7 +29,7 @@
         "@wocker/core": "^1.0.4",
         "@wocker/utils": "^1.0.2",
         "async-mutex": "^0.4.0",
-        "axios": "^1.4.0",
+        "axios": "^1.6.7",
         "chalk": "^2.4.2",
         "child_process": "^1.0.2",
         "cli-table3": "^0.6.2",
@@ -41,8 +41,7 @@
         "os": "^0.1.2",
         "path": "^0.12.7",
         "readable-stream": "^4.1.0",
-        "reflect-metadata": "^0.2.1",
-        "tty": "^1.0.1"
+        "reflect-metadata": "^0.2.1"
     },
     "devDependencies": {
         "@types/dockerode": "^3.3.23",

package/presets/node/config.json

@@ -8,7 +8,8 @@
                 "14-alpine3.14",
                 "16-alpine3.14",
                 "17-alpine3.14",
-                "18-alpine3.14"
+                "18-alpine3.14",
+                "20-alpine3.18"
             ]
         }
     },

package/presets/php-apache/Dockerfile

@@ -5,8 +5,7 @@ FROM php:${PHP_VERSION}-apache
 ARG UID=1000
 ARG USER=www-data
 
-RUN usermod -u 1000 www-data && \
-#    useradd -G root,www-data -u $UID -d /home/$USER $USER && \
+RUN usermod -u $UID www-data && \
     mkdir -p /home/$USER && \
     touch /home/$USER/.bashrc && \
     chown -R $USER:$USER /home/$USER
@@ -16,7 +15,6 @@ ADD ./bin/compare-version /usr/local/bin/compare-version
 RUN chmod +x /usr/local/bin/compare-version
 
 RUN apt-get update --fix-missing -y
-#RUN apt-get upgrade
 RUN apt-get install -y curl git
 
 #RUN apt-get install -y \
@@ -39,6 +37,14 @@ RUN if [ "$PDO_MYSQL_ENABLE" = "true" ]; then \
         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 \

package/presets/php-apache/config.json

@@ -20,6 +20,7 @@
             "options": {
                 "MYSQLI_ENABLE": "Mysqli",
                 "PDO_MYSQL_ENABLE": "PDO",
+                "PGSQL_ENABLE": "Pgsql",
                 "GD_ENABLE": "GD",
                 "ZIP_ENABLE": "Zip"
             }
@@ -34,7 +35,8 @@
             "options": [
                 "none",
                 "v17.9.1",
-                "v18.16.0"
+                "v18.16.0",
+                "v20.11.0"
             ]
         }
     },

package/presets/apache/.docker/apache2/apache2.conf

@@ -1,230 +0,0 @@
-# This is the main Apache server configuration file.  It contains the
-# configuration directives that give the server its instructions.
-# See http://httpd.apache.org/docs/2.4/ for detailed information about
-# the directives and /usr/share/doc/apache2/README.Debian about Debian specific
-# hints.
-#
-#
-# Summary of how the Apache 2 configuration works in Debian:
-# The Apache 2 web server configuration in Debian is quite different to
-# upstream's suggested way to configure the web server. This is because Debian's
-# default Apache2 installation attempts to make adding and removing modules,
-# virtual hosts, and extra configuration directives as flexible as possible, in
-# order to make automating the changes and administering the server as easy as
-# possible.
-
-# It is split into several files forming the configuration hierarchy outlined
-# below, all located in the /etc/apache2/ directory:
-#
-#       /etc/apache2/
-#       |-- apache2.conf
-#       |       `--  ports.conf
-#       |-- mods-enabled
-#       |       |-- *.load
-#       |       `-- *.conf
-#       |-- conf-enabled
-#       |       `-- *.conf
-#       `-- sites-enabled
-#               `-- *.conf
-#
-#
-# * apache2.conf is the main configuration file (this file). It puts the pieces
-#   together by including all remaining configuration files when starting up the
-#   web server.
-#
-# * ports.conf is always included from the main configuration file. It is
-#   supposed to determine listening ports for incoming connections which can be
-#   customized anytime.
-#
-# * Configuration files in the mods-enabled/, conf-enabled/ and sites-enabled/
-#   directories contain particular configuration snippets which manage modules,
-#   global configuration fragments, or virtual host configurations,
-#   respectively.
-#
-#   They are activated by symlinking available configuration files from their
-#   respective *-available/ counterparts. These should be managed by using our
-#   helpers a2enmod/a2dismod, a2ensite/a2dissite and a2enconf/a2disconf. See
-#   their respective man pages for detailed information.
-#
-# * The binary is called apache2. Due to the use of environment variables, in
-#   the default configuration, apache2 needs to be started/stopped with
-#   /etc/init.d/apache2 or apache2ctl. Calling /usr/bin/apache2 directly will not
-#   work with the default configuration.
-
-
-# Global configuration
-#
-
-#
-# ServerRoot: The top of the directory tree under which the server's
-# configuration, error, and log files are kept.
-#
-# NOTE!  If you intend to place this on an NFS (or otherwise network)
-# mounted filesystem then please read the Mutex documentation (available
-# at <URL:http://httpd.apache.org/docs/2.4/mod/core.html#mutex>);
-# you will save yourself a lot of trouble.
-#
-# Do NOT add a slash at the end of the directory path.
-#
-#ServerRoot "/etc/apache2"
-
-#
-# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
-#
-#Mutex file:${APACHE_LOCK_DIR} default
-
-#
-# The directory where shm and other runtime files will be stored.
-#
-
-DefaultRuntimeDir ${APACHE_RUN_DIR}
-
-#
-# PidFile: The file in which the server should record its process
-# identification number when it starts.
-# This needs to be set in /etc/apache2/envvars
-#
-PidFile ${APACHE_PID_FILE}
-
-#
-# Timeout: The number of seconds before receives and sends time out.
-#
-Timeout 300
-
-#
-# KeepAlive: Whether or not to allow persistent connections (more than
-# one request per connection). Set to "Off" to deactivate.
-#
-KeepAlive On
-
-#
-# MaxKeepAliveRequests: The maximum number of requests to allow
-# during a persistent connection. Set to 0 to allow an unlimited amount.
-# We recommend you leave this number high, for maximum performance.
-#
-MaxKeepAliveRequests 100
-
-#
-# KeepAliveTimeout: Number of seconds to wait for the next request from the
-# same client on the same connection.
-#
-KeepAliveTimeout 5
-
-
-# These need to be set in /etc/apache2/envvars
-User ${APACHE_RUN_USER}
-Group ${APACHE_RUN_GROUP}
-
-#
-# HostnameLookups: Log the names of clients or just their IP addresses
-# e.g., www.apache.org (on) or 204.62.129.132 (off).
-# The default is off because it'd be overall better for the net if people
-# had to knowingly turn this feature on, since enabling it means that
-# each client request will result in AT LEAST one lookup request to the
-# nameserver.
-#
-HostnameLookups Off
-
-# ErrorLog: The location of the error log file.
-# If you do not specify an ErrorLog directive within a <VirtualHost>
-# container, error messages relating to that virtual host will be
-# logged here.  If you *do* define an error logfile for a <VirtualHost>
-# container, that host's errors will be logged there and not here.
-#
-ErrorLog ${APACHE_LOG_DIR}/error.log
-
-#
-# LogLevel: Control the severity of messages logged to the error_log.
-# Available values: trace8, ..., trace1, debug, info, notice, warn,
-# error, crit, alert, emerg.
-# It is also possible to configure the log level for particular modules, e.g.
-# "LogLevel info ssl:warn"
-#
-LogLevel warn
-
-# Include module configuration:
-IncludeOptional mods-enabled/*.load
-IncludeOptional mods-enabled/*.conf
-
-# Include list of ports to listen on
-Include ports.conf
-
-
-# Sets the default security model of the Apache2 HTTPD server. It does
-# not allow access to the root filesystem outside of /usr/share and /var/www.
-# The former is used by web applications packaged in Debian,
-# the latter may be used for local directories served by the web server. If
-# your system is serving content from a sub-directory in /srv you must allow
-# access here, or in any related virtual host.
-<Directory />
-        Options FollowSymLinks
-        AllowOverride None
-        Require all denied
-</Directory>
-
-<Directory /usr/share>
-        AllowOverride None
-        Require all granted
-</Directory>
-
-<Directory /var/www/>
-        Options Indexes FollowSymLinks
-        AllowOverride None
-        Require all granted
-</Directory>
-
-#<Directory /srv/>
-#       Options Indexes FollowSymLinks
-#       AllowOverride None
-#       Require all granted
-#</Directory>
-
-
-
-
-# AccessFileName: The name of the file to look for in each directory
-# for additional configuration directives.  See also the AllowOverride
-# directive.
-#
-AccessFileName .htaccess
-
-#
-# The following lines prevent .htaccess and .htpasswd files from being
-# viewed by Web clients.
-#
-<FilesMatch "^\.ht">
-        Require all denied
-</FilesMatch>
-
-
-#
-# The following directives define some format nicknames for use with
-# a CustomLog directive.
-#
-# These deviate from the Common Log Format definitions in that they use %O
-# (the actual bytes sent including headers) instead of %b (the size of the
-# requested file), because the latter makes it impossible to detect partial
-# requests.
-#
-# Note that the use of %{X-Forwarded-For}i instead of %h is not recommended.
-# Use mod_remoteip instead.
-#
-LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
-LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat "%h %l %u %t \"%r\" %>s %O" common
-LogFormat "%{Referer}i -> %U" referer
-LogFormat "%{User-agent}i" agent
-
-# Include of directories ignores editors' and dpkg's backup files,
-# see README.Debian for details.
-
-# Include generic snippets of statements
-IncludeOptional conf-enabled/*.conf
-
-# Include the virtual host configurations:
-IncludeOptional sites-enabled/*.conf
-
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
-
-ServerTokens Prod
-ServerSignature Off

package/presets/apache/.docker/apache2/mods-available/mpm_prefork.conf

@@ -1,16 +0,0 @@
-# prefork MPM
-# StartServers: number of server processes to start
-# MinSpareServers: minimum number of server processes which are kept spare
-# MaxSpareServers: maximum number of server processes which are kept spare
-# MaxRequestWorkers: maximum number of server processes allowed to start
-# MaxConnectionsPerChild: maximum number of requests a server process serves
-
-<IfModule mpm_prefork_module>
-    StartServers            5
-    MinSpareServers         10
-    MaxSpareServers         20
-    MaxRequestWorkers       150
-    MaxConnectionsPerChild  0
-</IfModule>
-
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

package/presets/apache/.docker/apache2/sites-available/000-default.conf.conf

@@ -1,21 +0,0 @@
-<VirtualHost *:80>
-    # ServerName  preset.workspace
-    # ServerAlias preset-front.workspace
-
-    DocumentRoot /var/www/html
-    # SetEnv PHP_ENV live
-
-    # <Directory /var/www>
-    #     Options  +ExecCGI -Indexes +FollowSymLinks +MultiViews
-    #     AllowOverride All
-    #    Require all granted
-    # </Directory>
-
-    # <FilesMatch "\.(env|yml|sh|conf)|Dockerfile">
-    #     Order allow,deny
-    #     Deny from all
-    # </FilesMatch>
-
-    ErrorLog /dev/stderr
-    CustomLog /dev/stdout combined
-</VirtualHost>

package/presets/apache/Dockerfile

@@ -1,110 +0,0 @@
-ARG PHP_VERSION
-
-FROM php:${PHP_VERSION}-apache
-
-# WS Tools
-ADD ./bin/compare-version /usr/local/bin/compare-version
-RUN chmod +x /usr/local/bin/compare-version
-
-RUN apt-get update --fix-missing -y
-#RUN apt-get upgrade
-RUN apt-get install -y curl
-
-#RUN apt-get install -y \
-#      build-essential \
-#      libssl-dev \
-#      zlib1g-dev
-
-# Git
-#RUN apt-get install -y git
-
-# Mysqli
-ARG MYSQLI_ENABLE=true
-RUN if [ "$MYSQLI_ENABLE" = "true" ]; then \
-        docker-php-ext-install -j "$(nproc)" mysqli && \
-        docker-php-ext-enable mysqli; \
-    fi
-
-# pdo
-ARG PDO_MYSQL_ENABLE=true
-RUN if [ "$PDO_ENABLE" = "true" ]; then \
-        docker-php-ext-install pdo pdo_mysql &&  \
-        docker-php-ext-enable pdo_mysql; \
-    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
-
-#RUN 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
-
-#RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
-#RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/
-#RUN docker-php-ext-install gd
-
-# Zip
-ARG ZIP_ENABLE=false
-RUN if [ "$ZIP_ENABLE" = "true" ]; then \
-        apt-get install -y \
-            libzip-dev \
-            zip && \
-        docker-php-ext-configure zip && \
-        docker-php-ext-install -j "$(nproc)" zip; \
-    fi
-
-#RUN compare-version $PHP_VERSION "7.3" && \
-#    docker-php-ext-configure zip || \
-#    docker-php-ext-configure zip --with-libzip
-
-# Composer
-ARG COMPOSER_ENABLE=false
-RUN if [ "$COMPOSER_ENABLE" = "true" ]; then \
-        curl -sL https://getcomposer.org/installer | php && \
-        mv composer.phar /usr/local/bin/composer && \
-        chmod +x /usr/local/bin/composer; \
-    fi
-
-RUN a2enmod rewrite
-RUN a2enmod headers
-
-ADD ./.docker/apache2/sites-available/000-default.conf.conf /etc/apache2/sites-available/000-default.conf
-ADD ./.docker/apache2/apache2.conf /etc/apache2/apache2.conf
-COPY ./.docker/apache2/mods-available/mpm_prefork.conf /etc/apache2/mods-available/
-
-#RUN touch /usr/local/etc/php/conf.d/mail.ini && \
-#    echo "SMTP = maildev.workspace" >> /usr/local/etc/php/conf.d/mail.ini && \
-#    echo "smtp_port = 25" >> /usr/local/etc/php/conf.d/mail.ini
-
-#RUN touch /usr/local/etc/php/conf.d/uploads.ini && \
-#    echo "upload_max_filesize = 100M;" >> /usr/local/etc/php/conf.d/uploads.ini && \
-#    echo "post_max_size = 100M;" >> /usr/local/etc/php/conf.d/uploads.ini
-
-#RUN touch /usr/local/etc/php/conf.d/memory.ini && \
-#    echo "memory_limit = 256M;" >> /usr/local/etc/php/conf.d/memory.ini
-
-EXPOSE 80
-EXPOSE 443
-
-ENV APACHE_DOCUMENT_ROOT /var/www/html
-WORKDIR $APACHE_DOCUMENT_ROOT
-
-ARG UID=1000
-ARG USER=user
-
-RUN useradd -G www-data,root -u $UID -d /home/$USER $USER
-RUN mkdir -p /home/$USER/.composer && \
-    chown -R $USER:$USER /home/$USER
-
-USER $USER

package/presets/apache/bin/compare-version

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

package/presets/apache/config.json

@@ -1,47 +0,0 @@
-{
-    "dockerfile": "./Dockerfile",
-    "buildArgsOptions": {
-        "PHP_VERSION": {
-            "hash": false,
-            "message": "PHP version",
-            "type": "select",
-            "options": [
-                "5.6",
-                "7.3",
-                "7.4",
-                "8.0"
-            ]
-        },
-        "MYSQLI_ENABLE": {
-            "message": "Enable mysqli?",
-            "type": "boolean"
-        },
-        "PDO_MYSQL_ENABLE": {
-            "message": "Enable PDO Mysql?",
-            "type": "boolean"
-        },
-        "GD_ENABLE": {
-            "message": "Enable GD?",
-            "type": "boolean"
-        },
-        "COMPOSER_ENABLE": {
-            "message": "Install composer?",
-            "type": "boolean"
-        },
-        "ZIP_ENABLE": {
-            "message": "Enable zip?",
-            "type": "boolean"
-        },
-        "NODE_VERSION": {
-            "type": "select",
-            "message": "Node version",
-            "options": [
-                "none",
-                "v17.9.1"
-            ]
-        }
-    },
-    "volumes": [
-        "./:/var/www/html"
-    ]
-}