diff --git a/.docker/laravel-horizon/Dockerfile b/.docker/laravel-horizon/Dockerfile index b4d48df..0d863fd 100644 --- a/.docker/laravel-horizon/Dockerfile +++ b/.docker/laravel-horizon/Dockerfile @@ -4,12 +4,12 @@ #-------------------------------------------------------------------------- # -ARG ivpldock_PHP_VERSION -FROM php:${ivpldock_PHP_VERSION}-alpine +ARG devdock_PHP_VERSION +FROM php:${devdock_PHP_VERSION}-alpine LABEL maintainer="Mahmoud Zalt " -ARG ivpldock_PHP_VERSION +ARG devdock_PHP_VERSION # If you're in China, or you need to change sources, will be set CHANGE_SOURCE to true in .env. @@ -55,8 +55,8 @@ ENV PUID ${PUID} ARG PGID=1000 ENV PGID ${PGID} -RUN addgroup -g ${PGID} ivpldock && \ - adduser -D -G ivpldock -u ${PUID} ivpldock +RUN addgroup -g ${PGID} devdock && \ + adduser -D -G devdock -u ${PUID} devdock #Install BZ2: ARG INSTALL_BZ2=false @@ -156,7 +156,7 @@ ARG INSTALL_ZIP_ARCHIVE=false RUN set -eux; \ if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \ apk --update add libzip-dev && \ - if [ ${ivpldock_PHP_VERSION} = "7.3" ] || [ ${ivpldock_PHP_VERSION} = "7.4" ] || [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ + if [ ${devdock_PHP_VERSION} = "7.3" ] || [ ${devdock_PHP_VERSION} = "7.4" ] || [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ docker-php-ext-configure zip; \ else \ docker-php-ext-configure zip --with-libzip; \ diff --git a/.docker/php-fpm/Dockerfile b/.docker/php-fpm/Dockerfile index 0105ab5..74b324d 100644 --- a/.docker/php-fpm/Dockerfile +++ b/.docker/php-fpm/Dockerfile @@ -12,13 +12,13 @@ # Note: Base Image name format {image-tag}-{php-version} # -ARG IVPLDOCK_PHP_VERSION +ARG DEVDOCK_PHP_VERSION ARG BASE_IMAGE_TAG_PREFIX=latest -FROM laradock/php-fpm:${BASE_IMAGE_TAG_PREFIX}-${IVPLDOCK_PHP_VERSION} +FROM laradock/php-fpm:${BASE_IMAGE_TAG_PREFIX}-${DEVDOCK_PHP_VERSION} LABEL maintainer="Mahmoud Zalt " -ARG IVPLDOCK_PHP_VERSION +ARG DEVDOCK_PHP_VERSION # Set Environment Variables ENV DEBIAN_FRONTEND noninteractive @@ -53,7 +53,7 @@ RUN set -xe; \ # # next lines are here becase there is no auto build on dockerhub see https://github.com/laradock/laradock/pull/1903#issuecomment-463142846 libzip-dev zip unzip && \ - if [ ${IVPLDOCK_PHP_VERSION} = "7.3" ] || [ ${IVPLDOCK_PHP_VERSION} = "7.4" ] || [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ + if [ ${DEVDOCK_PHP_VERSION} = "7.3" ] || [ ${DEVDOCK_PHP_VERSION} = "7.4" ] || [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ docker-php-ext-configure zip; \ else \ docker-php-ext-configure zip --with-libzip; \ @@ -279,7 +279,7 @@ ARG INSTALL_PHPDBG=false RUN if [ ${INSTALL_PHPDBG} = true ]; then \ # Load the xdebug extension only with phpunit commands - apt-get install -yqq --force-yes php${IVPLDOCK_PHP_VERSION}-phpdbg \ + apt-get install -yqq --force-yes php${DEVDOCK_PHP_VERSION}-phpdbg \ ;fi ########################################################################### @@ -429,11 +429,11 @@ RUN set -eux; \ if [ ${INSTALL_AMQP} = true ]; then \ # # Install the amqp extension apt-get -yqq install librabbitmq-dev; \ - if [ ${IVPLDOCK_PHP_VERSION} = "7.3" ] \ - || [ ${IVPLDOCK_PHP_VERSION} = "7.2" ] \ - || [ ${IVPLDOCK_PHP_VERSION} = "7.1" ] \ - || [ ${IVPLDOCK_PHP_VERSION} = "7.0" ] \ - || [ ${IVPLDOCK_PHP_VERSION} = "5.6" ]; then \ + if [ ${DEVDOCK_PHP_VERSION} = "7.3" ] \ + || [ ${DEVDOCK_PHP_VERSION} = "7.2" ] \ + || [ ${DEVDOCK_PHP_VERSION} = "7.1" ] \ + || [ ${DEVDOCK_PHP_VERSION} = "7.0" ] \ + || [ ${DEVDOCK_PHP_VERSION} = "5.6" ]; then \ pecl install amqp-1.11.0; \ else \ pecl install amqp; \ @@ -472,8 +472,8 @@ RUN if [ ${INSTALL_CASSANDRA} = true ]; then \ make clean > /dev/null && \ make > /dev/null 2>&1 && \ make install && \ - echo "extension=cassandra.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/cassandra.ini && \ - ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/cassandra.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/30-cassandra.ini; \ + echo "extension=cassandra.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/cassandra.ini && \ + ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/cassandra.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/30-cassandra.ini; \ fi \ ;fi @@ -667,12 +667,12 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \ ARG INSTALL_IONCUBE=false RUN if [ ${INSTALL_IONCUBE} = true ]; then \ - if [ ${IVPLDOCK_PHP_VERSION} != "8.3" ] \ - && [ ${IVPLDOCK_PHP_VERSION} != "8.0" ]; then \ + if [ ${DEVDOCK_PHP_VERSION} != "8.3" ] \ + && [ ${DEVDOCK_PHP_VERSION} != "8.0" ]; then \ # Install the php ioncube loader curl -L -o /tmp/ioncube_loaders_lin_x86-64.tar.gz https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz \ && tar zxpf /tmp/ioncube_loaders_lin_x86-64.tar.gz -C /tmp \ - && mv /tmp/ioncube/ioncube_loader_lin_${IVPLDOCK_PHP_VERSION}.so $(php -r "echo ini_get('extension_dir');")/ioncube_loader.so \ + && mv /tmp/ioncube/ioncube_loader_lin_${DEVDOCK_PHP_VERSION}.so $(php -r "echo ini_get('extension_dir');")/ioncube_loader.so \ && printf "zend_extension=ioncube_loader.so\n" > $PHP_INI_DIR/conf.d/0ioncube.ini \ && rm -rf /tmp/ioncube* \ && php -m | grep -oiE '^ionCube Loader$' \ @@ -764,7 +764,7 @@ RUN set -eux; \ # Add Microsoft repo for Microsoft ODBC Driver 13 for Linux \ apt-get update \ && apt-get install -yqq apt-transport-https gnupg lsb-release \ - && if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] && [ ${IVPLDOCK_PHP_VERSION} != "8.0" ]; then \ + && if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] && [ ${DEVDOCK_PHP_VERSION} != "8.0" ]; then \ curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg \ ;else \ curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \ @@ -1087,17 +1087,17 @@ RUN if [ ${INSTALL_WKHTMLTOPDF} = true ]; then \ xfonts-75dpi \ wget \ # && cat /etc/os-release \ - && if [ ${IVPLDOCK_PHP_VERSION} = "5.6" ] || \ - [ ${IVPLDOCK_PHP_VERSION} = "7.0" ]; then \ + && if [ ${DEVDOCK_PHP_VERSION} = "5.6" ] || \ + [ ${DEVDOCK_PHP_VERSION} = "7.0" ]; then \ wget "https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.stretch_${ARCH}.deb"; \ dpkg -i "wkhtmltox_0.12.6-1.stretch_${ARCH}.deb"; \ - elif [ ${IVPLDOCK_PHP_VERSION} = "7.1" ] || \ - [ ${IVPLDOCK_PHP_VERSION} = "7.2" ] || \ - [ ${IVPLDOCK_PHP_VERSION} = "7.3" ] || \ - [ ${IVPLDOCK_PHP_VERSION} = "7.4" ]; then \ + elif [ ${DEVDOCK_PHP_VERSION} = "7.1" ] || \ + [ ${DEVDOCK_PHP_VERSION} = "7.2" ] || \ + [ ${DEVDOCK_PHP_VERSION} = "7.3" ] || \ + [ ${DEVDOCK_PHP_VERSION} = "7.4" ]; then \ wget "https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_${ARCH}.deb"; \ dpkg -i "wkhtmltox_0.12.6-1.buster_${ARCH}.deb"; \ - elif [ ${IVPLDOCK_PHP_VERSION} = "8.0" ]; then \ + elif [ ${DEVDOCK_PHP_VERSION} = "8.0" ]; then \ wget "https://github.com/wkhtmltopdf/packaging/releases/download/${WKHTMLTOPDF_VERSION}/wkhtmltox_${WKHTMLTOPDF_VERSION}.bullseye_${ARCH}.deb"; \ dpkg -i "wkhtmltox_${WKHTMLTOPDF_VERSION}.bullseye_${ARCH}.deb"; \ else \ @@ -1177,7 +1177,7 @@ RUN if [ ${INSTALL_PHPDECIMAL} = true ]; then \ echo 'decimal not support PHP 5.6'; \ else \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] && \ - [ ${IVPLDOCK_PHP_VERSION} != "8.0" ]; then \ + [ ${DEVDOCK_PHP_VERSION} != "8.0" ]; then \ curl -L -o /tmp/mpdecimal.tar.gz "https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-2.5.1.tar.gz"; \ mkdir -p /tmp/mpdecimal; \ tar -C /tmp/mpdecimal -zxvf /tmp/mpdecimal.tar.gz --strip 1; \ @@ -1360,7 +1360,7 @@ RUN if [ ${INSTALL_DNSUTILS} = true ]; then \ # Check PHP version: ########################################################################### -RUN set -xe; php -v | grep -q "PHP ${IVPLDOCK_PHP_VERSION}." +RUN set -xe; php -v | grep -q "PHP ${DEVDOCK_PHP_VERSION}." # #-------------------------------------------------------------------------- diff --git a/.docker/php-worker/Dockerfile b/.docker/php-worker/Dockerfile index 98e176b..9a4cfb5 100644 --- a/.docker/php-worker/Dockerfile +++ b/.docker/php-worker/Dockerfile @@ -4,12 +4,12 @@ #-------------------------------------------------------------------------- # -ARG IVPLDOCK_PHP_VERSION -FROM php:${IVPLDOCK_PHP_VERSION}-alpine +ARG DEVDOCK_PHP_VERSION +FROM php:${DEVDOCK_PHP_VERSION}-alpine LABEL maintainer="Mahmoud Zalt " -ARG IVPLDOCK_PHP_VERSION +ARG DEVDOCK_PHP_VERSION # If you're in China, or you need to change sources, will be set CHANGE_SOURCE to true in .env. @@ -75,7 +75,7 @@ ARG INSTALL_GNUPG=false RUN set -eux; \ if [ ${INSTALL_GNUPG} = true ]; then \ apk add --no-cache --no-progress --virtual BUILD_DEPS_PHP_GNUPG gpgme-dev; \ - if [ ${IVPLDOCK_PHP_VERSION} = "7.0" ]; then \ + if [ ${DEVDOCK_PHP_VERSION} = "7.0" ]; then \ wget -O /tmp/gnupg.tgz "https://pecl.php.net/get/gnupg-1.5.1.tgz"; \ mkdir -p /tmp/gnupg; \ tar -C /tmp/gnupg -zxvf /tmp/gnupg.tgz --strip 1; \ @@ -231,7 +231,7 @@ ARG INSTALL_ZIP_ARCHIVE=false RUN set -eux; \ if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \ apk --update add libzip-dev && \ - if [ ${IVPLDOCK_PHP_VERSION} = "7.3" ] || [ ${IVPLDOCK_PHP_VERSION} = "7.4" ] || [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ + if [ ${DEVDOCK_PHP_VERSION} = "7.3" ] || [ ${DEVDOCK_PHP_VERSION} = "7.4" ] || [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ docker-php-ext-configure zip; \ else \ docker-php-ext-configure zip --with-libzip; \ @@ -295,11 +295,11 @@ ARG INSTALL_AMQP=false RUN if [ ${INSTALL_AMQP} = true ]; then \ docker-php-ext-install sockets; \ apk --update add -q rabbitmq-c rabbitmq-c-dev && \ - if [ ${IVPLDOCK_PHP_VERSION} = "7.3" ] \ - || [ ${IVPLDOCK_PHP_VERSION} = "7.2" ] \ - || [ ${IVPLDOCK_PHP_VERSION} = "7.1" ] \ - || [ ${IVPLDOCK_PHP_VERSION} = "7.0" ] \ - || [ ${IVPLDOCK_PHP_VERSION} = "5.6" ]; then \ + if [ ${DEVDOCK_PHP_VERSION} = "7.3" ] \ + || [ ${DEVDOCK_PHP_VERSION} = "7.2" ] \ + || [ ${DEVDOCK_PHP_VERSION} = "7.1" ] \ + || [ ${DEVDOCK_PHP_VERSION} = "7.0" ] \ + || [ ${DEVDOCK_PHP_VERSION} = "5.6" ]; then \ printf "\n" | pecl install amqp-1.11.0; \ else \ printf "\n" | pecl install amqp; \ diff --git a/.docker/phpmyadmin/config.user.inc.php b/.docker/phpmyadmin/config.user.inc.php index 487fc9a..f9707a5 100644 --- a/.docker/phpmyadmin/config.user.inc.php +++ b/.docker/phpmyadmin/config.user.inc.php @@ -76,7 +76,7 @@ /** * Directories for saving/loading files from server */ -$cfg['UploadDir'] = '/var/www/html/tmp/ivpldock_databases/upload'; +$cfg['UploadDir'] = '/var/www/html/tmp/devdock_databases/upload'; $cfg['SaveDir'] = ''; /** diff --git a/.docker/workspace/Dockerfile b/.docker/workspace/Dockerfile index f40f41e..37aea5d 100644 --- a/.docker/workspace/Dockerfile +++ b/.docker/workspace/Dockerfile @@ -7,18 +7,18 @@ # https://github.com/Laradock/workspace # # To change its version, see the available Tags on the Docker Hub: -# https://hub.docker.com/r/ivpldock/workspace/tags/ +# https://hub.docker.com/r/devdock/workspace/tags/ # # Note: Base Image name format {image-tag}-{php-version} # -ARG IVPLDOCK_PHP_VERSION +ARG DEVDOCK_PHP_VERSION ARG BASE_IMAGE_TAG_PREFIX=latest -FROM laradock/workspace:${BASE_IMAGE_TAG_PREFIX}-${IVPLDOCK_PHP_VERSION} +FROM laradock/workspace:${BASE_IMAGE_TAG_PREFIX}-${DEVDOCK_PHP_VERSION} LABEL maintainer="Mahmoud Zalt " -ARG IVPLDOCK_PHP_VERSION +ARG DEVDOCK_PHP_VERSION # Set Environment Variables ENV DEBIAN_FRONTEND noninteractive @@ -27,7 +27,7 @@ ENV DEBIAN_FRONTEND noninteractive USER root # Set up default environment variables, sourcing from .env where possible -ARG IVPLDOCK_USER +ARG DEVDOCK_USER ARG WORKSPACE_WORKDIR ARG TIMEZONE ARG NODE_VERSION @@ -43,38 +43,58 @@ ENV DEBIAN_FRONTEND=noninteractive \ TZ=${TIMEZONE:-UTC} \ PUID=1000 \ PGID=1000 \ - IVPLDOCK_USER=${IVPLDOCK_USER:-ivpldock} \ + DEVDOCK_USER=${DEVDOCK_USER:-devdock} \ WORKDIR=${WORKSPACE_WORKDIR:-/var/www/projects} \ NODE_VERSION=${NODE_VERSION:-18} \ XDEBUG_PORT=${XDEBUG_PORT:-9003} \ VITE_PORT=${WORKSPACE_VITE_PORT:-5173} -# always run apt update when start and after add new source list, then clean up at end. -RUN set -xe; \ - apt-get update -yqq && \ - pecl channel-update pecl.php.net && \ - groupadd -g ${PGID} ivpldock && \ - useradd -l -u ${PUID} -g ivpldock -m ivpldock -G docker_env && \ - usermod -p "*" ivpldock -s /bin/bash && \ - apt-get install -yqq \ - apt-utils \ - # - #-------------------------------------------------------------------------- - # Mandatory Software's Installation - #-------------------------------------------------------------------------- - # - # Mandatory Software's such as ("php-cli", "git", "vim", ....) are - # installed on the base image 'ivpldock/workspace' image. If you want - # to add more Software's or remove existing one, you need to edit the - # base image (https://github.com/Laradock/workspace). - # - # next lines are here because there is no auto build on dockerhub see https://github.com/ivpldock/ivpldock/pull/1903#issuecomment-463142846 - libzip-dev zip unzip \ - # Install the zip extension - php${IVPLDOCK_PHP_VERSION}-zip \ - # nasm - nasm && \ - php -m | grep -q 'zip' +# expects: ARG PUID=1000 PGID=1000 DEVDOCK_PHP_VERSION=8.3 +RUN set -eux; \ + apt-get update -yqq; \ + pecl channel-update pecl.php.net; \ + \ + # -------- group: ensure "devdock" is GID=$PGID -------- + EXISTING_GRP_BY_GID="$(getent group "${PGID}" | cut -d: -f1 || true)"; \ + if [ -n "${EXISTING_GRP_BY_GID}" ]; then \ + [ "${EXISTING_GRP_BY_GID}" = "devdock" ] || groupmod -n devdock "${EXISTING_GRP_BY_GID}"; \ + elif getent group devdock >/dev/null; then \ + groupmod -g "${PGID}" devdock; \ + else \ + groupadd -g "${PGID}" devdock; \ + fi; \ + \ + # Always have this secondary group available + groupadd -f docker_env; \ + \ + # -------- user: ensure "devdock" is UID=$PUID and primary group devdock -------- + EXISTING_USER_BY_UID="$(getent passwd "${PUID}" | cut -d: -f1 || true)"; \ + if [ -n "${EXISTING_USER_BY_UID}" ] && [ "${EXISTING_USER_BY_UID}" != "devdock" ]; then \ + # UID 1000 belongs to e.g. 'ubuntu' -> rename to 'devdock' and move home + usermod -l devdock "${EXISTING_USER_BY_UID}"; \ + usermod -d /home/devdock -m devdock; \ + usermod -g devdock devdock; \ + elif id -u devdock >/dev/null 2>&1; then \ + # 'devdock' exists but wrong UID -> align UID + CURRENT_UID="$(id -u devdock)"; \ + [ "${CURRENT_UID}" = "${PUID}" ] || usermod -u "${PUID}" devdock; \ + usermod -g devdock devdock; \ + else \ + # no owner of UID 1000 and no 'devdock' -> create fresh + useradd -l -u "${PUID}" -g devdock -m -s /bin/bash devdock; \ + fi; \ + \ + # add supplemental group; set shell just in case + usermod -aG docker_env devdock; \ + chsh -s /bin/bash devdock; \ + \ + # -------- packages & php-zip check -------- + apt-get install -yqq --no-install-recommends \ + apt-utils \ + libzip-dev zip unzip \ + php${DEVDOCK_PHP_VERSION}-zip \ + nasm; \ + php -m | grep -q '^zip$' # #-------------------------------------------------------------------------- @@ -104,18 +124,18 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone USER root COPY ./aliases.sh /root/aliases.sh -COPY ./aliases.sh /home/ivpldock/aliases.sh +COPY ./aliases.sh /home/devdock/aliases.sh RUN sed -i 's/\r//' /root/aliases.sh && \ - sed -i 's/\r//' /home/ivpldock/aliases.sh && \ - chown ivpldock:ivpldock /home/ivpldock/aliases.sh && \ + sed -i 's/\r//' /home/devdock/aliases.sh && \ + chown devdock:devdock /home/devdock/aliases.sh && \ echo "" >> ~/.bashrc && \ echo "# Load Custom Aliases" >> ~/.bashrc && \ echo "export PS1='\W\$ '" >> ~/.bashrc && \ echo "source ~/aliases.sh" >> ~/.bashrc && \ echo "" >> ~/.bashrc -USER ivpldock +USER devdock RUN echo "" >> ~/.bashrc && \ echo "# Load Custom Aliases" >> ~/.bashrc && \ @@ -130,13 +150,13 @@ RUN echo "" >> ~/.bashrc && \ USER root # Add the composer.json -COPY ./composer.json /home/ivpldock/.composer/composer.json +COPY ./composer.json /home/devdock/.composer/composer.json # Add the auth.json for magento 2 credentials -COPY ./auth.json /home/ivpldock/.composer/auth.json +COPY ./auth.json /home/devdock/.composer/auth.json -# Make sure that ~/.composer belongs to ivpldock -RUN chown -R ivpldock:ivpldock /home/ivpldock/.composer +# Make sure that ~/.composer belongs to devdock +RUN chown -R devdock:devdock /home/devdock/.composer # Export composer vendor path RUN echo "" >> ~/.bashrc && \ @@ -148,7 +168,7 @@ ENV COMPOSER_VERSION ${COMPOSER_VERSION} RUN set -eux; \ composer self-update --${COMPOSER_VERSION}; -USER ivpldock +USER devdock # Check if global install need to be ran ARG COMPOSER_GLOBAL_INSTALL=false @@ -165,7 +185,7 @@ ENV COMPOSER_AUTH_JSON ${COMPOSER_AUTH_JSON} RUN if [ ${COMPOSER_AUTH_JSON} = false ]; then \ # remove the file - rm /home/ivpldock/.composer/auth.json \ + rm /home/devdock/.composer/auth.json \ ;fi ARG COMPOSER_REPO_PACKAGIST @@ -184,7 +204,7 @@ RUN echo "" >> ~/.bashrc && \ ########################################################################### # add ./vendor/bin to non-root user's bashrc (needed for phpunit) -USER ivpldock +USER devdock RUN echo "" >> ~/.bashrc && \ echo 'export PATH="/var/www/vendor/bin:$PATH"' >> ~/.bashrc @@ -208,48 +228,48 @@ ARG INSTALL_GNUPG=false ARG INSTALL_SSH2=false ARG INSTALL_SOAP=false ARG INSTALL_XSL=false -ARG PHP_VERSION=${IVPLDOCK_PHP_VERSION} +ARG PHP_VERSION=${DEVDOCK_PHP_VERSION} RUN set -eux; \ ########################################################################### # BZ2: ########################################################################### if [ ${INSTALL_BZ2} = true ]; then \ - apt-get -yqq install php${IVPLDOCK_PHP_VERSION}-bz2; \ + apt-get -yqq install php${DEVDOCK_PHP_VERSION}-bz2; \ fi; \ ########################################################################### # GMP (GNU Multiple Precision): ########################################################################### if [ ${INSTALL_GMP} = true ]; then \ # Install the PHP GMP extension - apt-get -yqq install php${IVPLDOCK_PHP_VERSION}-gmp; \ + apt-get -yqq install php${DEVDOCK_PHP_VERSION}-gmp; \ fi; \ ########################################################################### # GnuPG: ########################################################################### if [ ${INSTALL_GNUPG} = true ]; then \ - apt-get -yqq install php${IVPLDOCK_PHP_VERSION}-gnupg; \ + apt-get -yqq install php${DEVDOCK_PHP_VERSION}-gnupg; \ fi; \ ########################################################################### # SSH2: ########################################################################### if [ ${INSTALL_SSH2} = true ]; then \ # Install the PHP SSH2 extension - apt-get -yqq install libssh2-1-dev php${IVPLDOCK_PHP_VERSION}-ssh2; \ + apt-get -yqq install libssh2-1-dev php${DEVDOCK_PHP_VERSION}-ssh2; \ fi; \ ########################################################################### # SOAP: ########################################################################### if [ ${INSTALL_SOAP} = true ]; then \ # Install the PHP SOAP extension - apt-get -yqq install libxml2-dev php${IVPLDOCK_PHP_VERSION}-soap; \ + apt-get -yqq install libxml2-dev php${DEVDOCK_PHP_VERSION}-soap; \ fi; \ ########################################################################### # XSL: ########################################################################### if [ ${INSTALL_XSL} = true ]; then \ # Install the PHP XSL extension - apt-get -yqq install libxslt-dev php${IVPLDOCK_PHP_VERSION}-xsl; \ + apt-get -yqq install libxslt-dev php${DEVDOCK_PHP_VERSION}-xsl; \ fi ########################################################################### @@ -264,7 +284,7 @@ RUN set -eux; \ # IMAP: ########################################################################### if [ ${INSTALL_IMAP} = true ]; then \ - apt-get install -yqq php${IVPLDOCK_PHP_VERSION}-imap; \ + apt-get install -yqq php${DEVDOCK_PHP_VERSION}-imap; \ fi; ########################################################################### @@ -280,31 +300,31 @@ ARG INSTALL_XDEBUG=false ARG XDEBUG_CLIENT_HOST ARG XDEBUG_PORT=9003 -RUN apt-get install -yqq pkg-config php-xml php${IVPLDOCK_PHP_VERSION}-xml && \ +RUN apt-get install -yqq pkg-config php-xml php${DEVDOCK_PHP_VERSION}-xml && \ pecl install xdebug-3.3.0 && \ - echo "zend_extension=xdebug.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/20-xdebug.ini + echo "zend_extension=xdebug.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/20-xdebug.ini RUN echo "##### PHP Version #####" \ - ${IVPLDOCK_PHP_VERSION} \ + ${DEVDOCK_PHP_VERSION} \ "##### /PHP Version #####" # ADD for REMOTE debugging -COPY ./xdebug.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini +COPY ./xdebug.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini RUN if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \ - sed -i "s/xdebug.remote_host=/xdebug.client_host=/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ - sed -i "s/xdebug.remote_connect_back=0/xdebug.discover_client_host=false/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ - sed -i "s/xdebug.remote_port=9000/xdebug.client_port=${XDEBUG_PORT}/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ - sed -i "s/xdebug.profiler_enable=0/; xdebug.profiler_enable=0/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ - sed -i "s/xdebug.profiler_output_dir=/xdebug.output_dir=/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ - sed -i "s/xdebug.remote_mode=req/; xdebug.remote_mode=req/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ - sed -i "s/xdebug.remote_autostart=0/xdebug.start_with_request=yes/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ - sed -i "s/xdebug.remote_enable=0/xdebug.mode=debug/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini \ + sed -i "s/xdebug.remote_host=/xdebug.client_host=/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ + sed -i "s/xdebug.remote_connect_back=0/xdebug.discover_client_host=false/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ + sed -i "s/xdebug.remote_port=9000/xdebug.client_port=${XDEBUG_PORT}/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ + sed -i "s/xdebug.profiler_enable=0/; xdebug.profiler_enable=0/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ + sed -i "s/xdebug.profiler_output_dir=/xdebug.output_dir=/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ + sed -i "s/xdebug.remote_mode=req/; xdebug.remote_mode=req/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ + sed -i "s/xdebug.remote_autostart=0/xdebug.start_with_request=yes/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ + sed -i "s/xdebug.remote_enable=0/xdebug.mode=debug/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini \ ;else \ - sed -i "s/xdebug.remote_autostart=0/xdebug.remote_autostart=1/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ - sed -i "s/xdebug.remote_enable=0/xdebug.remote_enable=1/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini \ + sed -i "s/xdebug.remote_autostart=0/xdebug.remote_autostart=1/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ + sed -i "s/xdebug.remote_enable=0/xdebug.remote_enable=1/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini \ ;fi -RUN sed -i "s/xdebug.cli_color=0/xdebug.cli_color=1/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini +RUN sed -i "s/xdebug.cli_color=0/xdebug.cli_color=1/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini ########################################################################### # pcov: @@ -314,9 +334,9 @@ USER root # Install pcov for code coverage RUN pecl install pcov && \ - echo "extension=pcov.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/20-pcov.ini + echo "extension=pcov.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/20-pcov.ini -#echo "pcov.enabled" >> /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/20-pcov.ini +#echo "pcov.enabled" >> /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/20-pcov.ini ########################################################################### # PHPREDIS EXTENSION @@ -326,7 +346,7 @@ ARG INSTALL_PHPREDIS=false RUN if [ ${INSTALL_PHPREDIS} = true ]; then \ apt-get update \ - && apt-get install -yqq php${IVPLDOCK_PHP_VERSION}-redis \ + && apt-get install -yqq php${DEVDOCK_PHP_VERSION}-redis \ ;fi ########################################################################### @@ -348,12 +368,12 @@ ARG INSTALL_INOTIFY=false RUN if [ ${INSTALL_INOTIFY} = true ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ pecl -q install inotify-0.1.6 && \ - echo "extension=inotify.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/inotify.ini && \ - ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/inotify.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/20-inotify.ini; \ + echo "extension=inotify.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/inotify.ini && \ + ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/inotify.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/20-inotify.ini; \ else \ pecl -q install inotify && \ - echo "extension=inotify.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/inotify.ini && \ - ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/inotify.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/20-inotify.ini \ + echo "extension=inotify.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/inotify.ini && \ + ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/inotify.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/20-inotify.ini \ ;fi \ ;fi @@ -370,7 +390,7 @@ RUN if [ ${INSTALL_FSWATCH} = true ]; then \ && apt-get -y install fswatch \ ;fi -USER ivpldock +USER devdock ########################################################################### # Node / NVM: @@ -392,7 +412,7 @@ ARG NPM_FETCH_RETRY_MINTIMEOUT ENV NPM_FETCH_RETRY_MINTIMEOUT ${NPM_FETCH_RETRY_MINTIMEOUT} ARG NPM_FETCH_RETRY_MAXTIMEOUT ENV NPM_FETCH_RETRY_MAXTIMEOUT ${NPM_FETCH_RETRY_MAXTIMEOUT} -ENV NVM_DIR /home/ivpldock/.nvm +ENV NVM_DIR /home/devdock/.nvm ARG NVM_NODEJS_ORG_MIRROR ENV NVM_NODEJS_ORG_MIRROR ${NVM_NODEJS_ORG_MIRROR} @@ -414,7 +434,7 @@ RUN echo "" >> ~/.bashrc && \ USER root RUN echo "" >> ~/.bashrc && \ - echo 'export NVM_DIR="/home/ivpldock/.nvm"' >> ~/.bashrc && \ + echo 'export NVM_DIR="/home/devdock/.nvm"' >> ~/.bashrc && \ echo '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm' >> ~/.bashrc # Make it so the node modules can be executed with 'docker-compose exec' @@ -427,13 +447,13 @@ RUN find $NVM_DIR -type f -name node -exec ln -s {} /usr/local/bin/node \; && \ # Mount .npmrc into home folder COPY ./.npmrc /root/.npmrc -COPY ./.npmrc /home/${IVPLDOCK_USER}/.npmrc +COPY ./.npmrc /home/${DEVDOCK_USER}/.npmrc ########################################################################### # YARN: ########################################################################### -USER ${IVPLDOCK_USER} +USER ${DEVDOCK_USER} ARG INSTALL_YARN=false ARG YARN_VERSION=latest @@ -450,11 +470,11 @@ RUN [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" && \ USER root RUN echo "" >> ~/.bashrc && \ - echo 'export YARN_DIR="/home/${IVPLDOCK_USER}/.yarn"' >> ~/.bashrc && \ + echo 'export YARN_DIR="/home/${DEVDOCK_USER}/.yarn"' >> ~/.bashrc && \ echo 'export PATH="$YARN_DIR/bin:$PATH"' >> ~/.bashrc # Add PATH for YARN -ENV PATH $PATH:/home/${IVPLDOCK_USER}/.yarn/bin +ENV PATH $PATH:/home/${DEVDOCK_USER}/.yarn/bin USER root @@ -473,7 +493,7 @@ RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \ ;fi\ ;fi -USER ivpldock +USER devdock ########################################################################### # PYTHON2: @@ -506,7 +526,7 @@ RUN if [ ${INSTALL_PYTHON3} = true ]; then \ && python3 -m pip install --upgrade virtualenv \ ;fi -USER ivpldock +USER devdock ########################################################################### # ImageMagick: @@ -537,8 +557,8 @@ RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ else \ pecl install imagick; \ fi && \ - echo "extension=imagick.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/imagick.ini && \ - ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/imagick.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/20-imagick.ini && \ + echo "extension=imagick.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/imagick.ini && \ + ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/imagick.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/20-imagick.ini && \ php -m | grep -q 'imagick' \ ;fi @@ -601,7 +621,7 @@ RUN if [ ${INSTALL_GIT_PROMPT} = true ]; then \ # Check PHP version: ########################################################################### -RUN set -xe; php -v | head -n 1 | grep -q "PHP ${IVPLDOCK_PHP_VERSION}." +RUN set -xe; php -v | head -n 1 | grep -q "PHP ${DEVDOCK_PHP_VERSION}." ########################################################################### # Oh My ZSH! @@ -617,10 +637,10 @@ RUN if [ ${SHELL_OH_MY_ZSH} = true ]; then \ ARG SHELL_OH_MY_ZSH_AUTOSUGESTIONS=false ARG SHELL_OH_MY_ZSH_ALIASES=false -USER ivpldock +USER devdock RUN if [ ${SHELL_OH_MY_ZSH} = true ]; then \ sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh) --keep-zshrc" && \ - sed -i -r 's/^plugins=\(.*?\)$/plugins=(laravel composer)/' /home/ivpldock/.zshrc && \ + sed -i -r 's/^plugins=\(.*?\)$/plugins=(laravel composer)/' /home/devdock/.zshrc && \ echo '\n\ bindkey "^[OB" down-line-or-search\n\ bindkey "^[OC" forward-char\n\ @@ -632,20 +652,20 @@ bindkey "^[[3~" delete-char\n\ bindkey "^[[4~" end-of-line\n\ bindkey "^[[5~" up-line-or-history\n\ bindkey "^[[6~" down-line-or-history\n\ -bindkey "^?" backward-delete-char\n' >> /home/ivpldock/.zshrc && \ +bindkey "^?" backward-delete-char\n' >> /home/devdock/.zshrc && \ if [ ${SHELL_OH_MY_ZSH_AUTOSUGESTIONS} = true ]; then \ - sh -c "git clone https://github.com/zsh-users/zsh-autosuggestions /home/ivpldock/.oh-my-zsh/custom/plugins/zsh-autosuggestions" && \ - sed -i 's~plugins=(~plugins=(zsh-autosuggestions ~g' /home/ivpldock/.zshrc && \ - sed -i '1iZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20' /home/ivpldock/.zshrc && \ - sed -i '1iZSH_AUTOSUGGEST_STRATEGY=(history completion)' /home/ivpldock/.zshrc && \ - sed -i '1iZSH_AUTOSUGGEST_USE_ASYNC=1' /home/ivpldock/.zshrc && \ - sed -i '1iTERM=xterm-256color' /home/ivpldock/.zshrc \ + sh -c "git clone https://github.com/zsh-users/zsh-autosuggestions /home/devdock/.oh-my-zsh/custom/plugins/zsh-autosuggestions" && \ + sed -i 's~plugins=(~plugins=(zsh-autosuggestions ~g' /home/devdock/.zshrc && \ + sed -i '1iZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20' /home/devdock/.zshrc && \ + sed -i '1iZSH_AUTOSUGGEST_STRATEGY=(history completion)' /home/devdock/.zshrc && \ + sed -i '1iZSH_AUTOSUGGEST_USE_ASYNC=1' /home/devdock/.zshrc && \ + sed -i '1iTERM=xterm-256color' /home/devdock/.zshrc \ ;fi && \ if [ ${SHELL_OH_MY_ZSH_ALIASES} = true ]; then \ - echo "" >> /home/ivpldock/.zshrc && \ - echo "# Load Custom Aliases" >> /home/ivpldock/.zshrc && \ - echo "source /home/ivpldock/aliases.sh" >> /home/ivpldock/.zshrc && \ - echo "" >> /home/ivpldock/.zshrc \ + echo "" >> /home/devdock/.zshrc && \ + echo "# Load Custom Aliases" >> /home/devdock/.zshrc && \ + echo "source /home/devdock/aliases.sh" >> /home/devdock/.zshrc && \ + echo "" >> /home/devdock/.zshrc \ ;fi \ ;fi @@ -658,19 +678,19 @@ USER root USER root COPY ./aliases.sh /root/aliases.sh -COPY ./aliases.sh /home/ivpldock/aliases.sh +COPY ./aliases.sh /home/devdock/aliases.sh RUN if [ ${SHELL_OH_MY_ZSH} = true ]; then \ sed -i 's/\r//' /root/aliases.sh && \ - sed -i 's/\r//' /home/ivpldock/aliases.sh && \ - chown ivpldock:ivpldock /home/ivpldock/aliases.sh && \ + sed -i 's/\r//' /home/devdock/aliases.sh && \ + chown devdock:devdock /home/devdock/aliases.sh && \ echo "" >> ~/.zshrc && \ echo "# Load Custom Aliases" >> ~/.zshrc && \ echo "source ~/aliases.sh" >> ~/.zshrc && \ echo "" >> ~/.zshrc \ ;fi -USER ivpldock +USER devdock RUN if [ ${SHELL_OH_MY_ZSH} = true ]; then \ echo "" >> ~/.zshrc && \ diff --git a/.docker/workspace/Dockerfile.74 b/.docker/workspace/Dockerfile.74 index 56ee574..a3a056a 100644 --- a/.docker/workspace/Dockerfile.74 +++ b/.docker/workspace/Dockerfile.74 @@ -7,18 +7,18 @@ # https://github.com/Laradock/workspace # # To change its version, see the available Tags on the Docker Hub: -# https://hub.docker.com/r/ivpldock/workspace/tags/ +# https://hub.docker.com/r/devdock/workspace/tags/ # # Note: Base Image name format {image-tag}-{php-version} # -ARG IVPLDOCK_PHP_VERSION +ARG DEVDOCK_PHP_VERSION ARG BASE_IMAGE_TAG_PREFIX=latest -FROM laradock/workspace:${BASE_IMAGE_TAG_PREFIX}-${IVPLDOCK_PHP_VERSION} +FROM laradock/workspace:${BASE_IMAGE_TAG_PREFIX}-${DEVDOCK_PHP_VERSION} LABEL maintainer="Mahmoud Zalt " -ARG IVPLDOCK_PHP_VERSION +ARG DEVDOCK_PHP_VERSION # Set Environment Variables ENV DEBIAN_FRONTEND noninteractive @@ -51,9 +51,9 @@ ENV PGID ${PGID} RUN set -xe; \ apt-get update -yqq && \ pecl channel-update pecl.php.net && \ - groupadd -g ${PGID} ivpldock && \ - useradd -l -u ${PUID} -g ivpldock -m ivpldock -G docker_env && \ - usermod -p "*" ivpldock -s /bin/bash && \ + groupadd -g ${PGID} devdock && \ + useradd -l -u ${PUID} -g devdock -m devdock -G docker_env && \ + usermod -p "*" devdock -s /bin/bash && \ apt-get install -yqq \ apt-utils \ # @@ -62,14 +62,14 @@ RUN set -xe; \ #-------------------------------------------------------------------------- # # Mandatory Software's such as ("php-cli", "git", "vim", ....) are - # installed on the base image 'ivpldock/workspace' image. If you want + # installed on the base image 'devdock/workspace' image. If you want # to add more Software's or remove existing one, you need to edit the # base image (https://github.com/Laradock/workspace). # - # next lines are here because there is no auto build on dockerhub see https://github.com/ivpldock/ivpldock/pull/1903#issuecomment-463142846 + # next lines are here because there is no auto build on dockerhub see https://github.com/devdock/devdock/pull/1903#issuecomment-463142846 libzip-dev zip unzip \ # Install the zip extension - php${IVPLDOCK_PHP_VERSION}-zip \ + php${DEVDOCK_PHP_VERSION}-zip \ # nasm nasm && \ php -m | grep -q 'zip' @@ -102,18 +102,18 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone USER root COPY ./aliases.sh /root/aliases.sh -COPY ./aliases.sh /home/ivpldock/aliases.sh +COPY ./aliases.sh /home/devdock/aliases.sh RUN sed -i 's/\r//' /root/aliases.sh && \ - sed -i 's/\r//' /home/ivpldock/aliases.sh && \ - chown ivpldock:ivpldock /home/ivpldock/aliases.sh && \ + sed -i 's/\r//' /home/devdock/aliases.sh && \ + chown devdock:devdock /home/devdock/aliases.sh && \ echo "" >> ~/.bashrc && \ echo "# Load Custom Aliases" >> ~/.bashrc && \ echo "export PS1='\W\$ '" >> ~/.bashrc && \ echo "source ~/aliases.sh" >> ~/.bashrc && \ echo "" >> ~/.bashrc -USER ivpldock +USER devdock RUN echo "" >> ~/.bashrc && \ echo "# Load Custom Aliases" >> ~/.bashrc && \ @@ -128,13 +128,13 @@ RUN echo "" >> ~/.bashrc && \ USER root # Add the composer.json -COPY ./composer.json /home/ivpldock/.composer/composer.json +COPY ./composer.json /home/devdock/.composer/composer.json # Add the auth.json for magento 2 credentials -COPY ./auth.json /home/ivpldock/.composer/auth.json +COPY ./auth.json /home/devdock/.composer/auth.json -# Make sure that ~/.composer belongs to ivpldock -RUN chown -R ivpldock:ivpldock /home/ivpldock/.composer +# Make sure that ~/.composer belongs to devdock +RUN chown -R devdock:devdock /home/devdock/.composer # Export composer vendor path RUN echo "" >> ~/.bashrc && \ @@ -150,7 +150,7 @@ RUN set -eux; \ composer self-update ${COMPOSER_VERSION}; \ fi -USER ivpldock +USER devdock # Check if global install need to be ran ARG COMPOSER_GLOBAL_INSTALL=false @@ -167,7 +167,7 @@ ENV COMPOSER_AUTH_JSON ${COMPOSER_AUTH_JSON} RUN if [ ${COMPOSER_AUTH_JSON} = false ]; then \ # remove the file - rm /home/ivpldock/.composer/auth.json \ + rm /home/devdock/.composer/auth.json \ ;fi ARG COMPOSER_REPO_PACKAGIST @@ -186,7 +186,7 @@ RUN echo "" >> ~/.bashrc && \ ########################################################################### # add ./vendor/bin to non-root user's bashrc (needed for phpunit) -USER ivpldock +USER devdock RUN echo "" >> ~/.bashrc && \ echo 'export PATH="/var/www/vendor/bin:$PATH"' >> ~/.bashrc @@ -246,48 +246,48 @@ ARG INSTALL_GNUPG=false ARG INSTALL_SSH2=false ARG INSTALL_SOAP=false ARG INSTALL_XSL=false -ARG PHP_VERSION=${IVPLDOCK_PHP_VERSION} +ARG PHP_VERSION=${DEVDOCK_PHP_VERSION} RUN set -eux; \ ########################################################################### # BZ2: ########################################################################### if [ ${INSTALL_BZ2} = true ]; then \ - apt-get -yqq install php${IVPLDOCK_PHP_VERSION}-bz2; \ + apt-get -yqq install php${DEVDOCK_PHP_VERSION}-bz2; \ fi; \ ########################################################################### # GMP (GNU Multiple Precision): ########################################################################### if [ ${INSTALL_GMP} = true ]; then \ # Install the PHP GMP extension - apt-get -yqq install php${IVPLDOCK_PHP_VERSION}-gmp; \ + apt-get -yqq install php${DEVDOCK_PHP_VERSION}-gmp; \ fi; \ ########################################################################### # GnuPG: ########################################################################### if [ ${INSTALL_GNUPG} = true ]; then \ - apt-get -yqq install php${IVPLDOCK_PHP_VERSION}-gnupg; \ + apt-get -yqq install php${DEVDOCK_PHP_VERSION}-gnupg; \ fi; \ ########################################################################### # SSH2: ########################################################################### if [ ${INSTALL_SSH2} = true ]; then \ # Install the PHP SSH2 extension - apt-get -yqq install libssh2-1-dev php${IVPLDOCK_PHP_VERSION}-ssh2; \ + apt-get -yqq install libssh2-1-dev php${DEVDOCK_PHP_VERSION}-ssh2; \ fi; \ ########################################################################### # SOAP: ########################################################################### if [ ${INSTALL_SOAP} = true ]; then \ # Install the PHP SOAP extension - apt-get -yqq install libxml2-dev php${IVPLDOCK_PHP_VERSION}-soap; \ + apt-get -yqq install libxml2-dev php${DEVDOCK_PHP_VERSION}-soap; \ fi; \ ########################################################################### # XSL: ########################################################################### if [ ${INSTALL_XSL} = true ]; then \ # Install the PHP XSL extension - apt-get -yqq install libxslt-dev php${IVPLDOCK_PHP_VERSION}-xsl; \ + apt-get -yqq install libxslt-dev php${DEVDOCK_PHP_VERSION}-xsl; \ fi ########################################################################### @@ -302,19 +302,19 @@ RUN set -eux; \ # LDAP: ########################################################################### if [ ${INSTALL_LDAP} = true ]; then \ - apt-get install -yqq libldap2-dev php${IVPLDOCK_PHP_VERSION}-ldap; \ + apt-get install -yqq libldap2-dev php${DEVDOCK_PHP_VERSION}-ldap; \ fi; \ ########################################################################### # SMB: ########################################################################### if [ ${INSTALL_SMB} = true ]; then \ - apt-get install -yqq smbclient php${IVPLDOCK_PHP_VERSION}-smbclient coreutils; \ + apt-get install -yqq smbclient php${DEVDOCK_PHP_VERSION}-smbclient coreutils; \ fi; \ ########################################################################### # IMAP: ########################################################################### if [ ${INSTALL_IMAP} = true ]; then \ - apt-get install -yqq php${IVPLDOCK_PHP_VERSION}-imap; \ + apt-get install -yqq php${DEVDOCK_PHP_VERSION}-imap; \ fi; \ ########################################################################### # Subversion: @@ -335,7 +335,7 @@ ARG XDEBUG_PORT=9003 RUN if [ ${INSTALL_XDEBUG} = true ]; then \ # Install the xdebug extension # https://xdebug.org/docs/compat - apt-get install -yqq pkg-config php-xml php${IVPLDOCK_PHP_VERSION}-xml && \ + apt-get install -yqq pkg-config php-xml php${DEVDOCK_PHP_VERSION}-xml && \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ pecl install xdebug-3.3.0; \ @@ -353,26 +353,26 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \ fi \ fi \ fi && \ - echo "zend_extension=xdebug.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/20-xdebug.ini \ + echo "zend_extension=xdebug.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/20-xdebug.ini \ ;fi # ADD for REMOTE debugging -COPY ./xdebug.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini +COPY ./xdebug.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini RUN if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \ - sed -i "s/xdebug.remote_host=/xdebug.client_host=/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ - sed -i "s/xdebug.remote_connect_back=0/xdebug.discover_client_host=false/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ - sed -i "s/xdebug.remote_port=9000/xdebug.client_port=${XDEBUG_PORT}/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ - sed -i "s/xdebug.profiler_enable=0/; xdebug.profiler_enable=0/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ - sed -i "s/xdebug.profiler_output_dir=/xdebug.output_dir=/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ - sed -i "s/xdebug.remote_mode=req/; xdebug.remote_mode=req/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ - sed -i "s/xdebug.remote_autostart=0/xdebug.start_with_request=yes/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ - sed -i "s/xdebug.remote_enable=0/xdebug.mode=debug/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini \ + sed -i "s/xdebug.remote_host=/xdebug.client_host=/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ + sed -i "s/xdebug.remote_connect_back=0/xdebug.discover_client_host=false/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ + sed -i "s/xdebug.remote_port=9000/xdebug.client_port=${XDEBUG_PORT}/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ + sed -i "s/xdebug.profiler_enable=0/; xdebug.profiler_enable=0/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ + sed -i "s/xdebug.profiler_output_dir=/xdebug.output_dir=/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ + sed -i "s/xdebug.remote_mode=req/; xdebug.remote_mode=req/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ + sed -i "s/xdebug.remote_autostart=0/xdebug.start_with_request=yes/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ + sed -i "s/xdebug.remote_enable=0/xdebug.mode=debug/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini \ ;else \ - sed -i "s/xdebug.remote_autostart=0/xdebug.remote_autostart=1/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ - sed -i "s/xdebug.remote_enable=0/xdebug.remote_enable=1/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini \ + sed -i "s/xdebug.remote_autostart=0/xdebug.remote_autostart=1/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ + sed -i "s/xdebug.remote_enable=0/xdebug.remote_enable=1/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini \ ;fi -RUN sed -i "s/xdebug.cli_color=0/xdebug.cli_color=1/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini +RUN sed -i "s/xdebug.cli_color=0/xdebug.cli_color=1/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini ########################################################################### # pcov: @@ -385,8 +385,8 @@ ARG INSTALL_PCOV=false RUN if [ ${INSTALL_PCOV} = true ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") != "0" ]; }; then \ pecl install pcov && \ - echo "extension=pcov.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/cli/php.ini && \ - echo "pcov.enabled" >> /etc/php/${IVPLDOCK_PHP_VERSION}/cli/php.ini \ + echo "extension=pcov.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/cli/php.ini && \ + echo "pcov.enabled" >> /etc/php/${DEVDOCK_PHP_VERSION}/cli/php.ini \ ;fi \ ;fi @@ -401,7 +401,7 @@ ARG INSTALL_PHPDBG=false RUN if [ ${INSTALL_PHPDBG} = true ]; then \ # Load the xdebug extension only with phpunit commands - apt-get install -y --force-yes php${IVPLDOCK_PHP_VERSION}-phpdbg \ + apt-get install -y --force-yes php${DEVDOCK_PHP_VERSION}-phpdbg \ ;fi ########################################################################### @@ -432,8 +432,8 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \ apt-get install -yqq pkg-config && \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ pecl install mongo; \ - echo "extension=mongo.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/mongo.ini; \ - ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/mongo.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/30-mongo.ini; \ + echo "extension=mongo.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/mongo.ini; \ + ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/mongo.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/30-mongo.ini; \ php -m | grep -oiE '^mongo$'; \ else \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") != "4" ]; then \ @@ -445,8 +445,8 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \ else \ pecl install mongodb; \ fi; \ - echo "extension=mongodb.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/mongodb.ini; \ - ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/mongodb.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/30-mongodb.ini; \ + echo "extension=mongodb.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/mongodb.ini; \ + ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/mongodb.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/30-mongodb.ini; \ php -m | grep -oiE '^mongodb$'; \ fi; \ fi @@ -459,17 +459,17 @@ ARG INSTALL_AMQP=false RUN if [ ${INSTALL_AMQP} = true ]; then \ apt-get install -yqq librabbitmq-dev && \ - if [ ${IVPLDOCK_PHP_VERSION} = "7.3" ] \ - || [ ${IVPLDOCK_PHP_VERSION} = "7.2" ] \ - || [ ${IVPLDOCK_PHP_VERSION} = "7.1" ] \ - || [ ${IVPLDOCK_PHP_VERSION} = "7.0" ] \ - || [ ${IVPLDOCK_PHP_VERSION} = "5.6" ]; then \ + if [ ${DEVDOCK_PHP_VERSION} = "7.3" ] \ + || [ ${DEVDOCK_PHP_VERSION} = "7.2" ] \ + || [ ${DEVDOCK_PHP_VERSION} = "7.1" ] \ + || [ ${DEVDOCK_PHP_VERSION} = "7.0" ] \ + || [ ${DEVDOCK_PHP_VERSION} = "5.6" ]; then \ printf "\n" | pecl install amqp-1.11.0; \ else \ printf "\n" | pecl install amqp; \ fi && \ - echo "extension=amqp.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/amqp.ini && \ - ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/amqp.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/30-amqp.ini && \ + echo "extension=amqp.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/amqp.ini && \ + ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/amqp.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/30-amqp.ini && \ php -m | grep -oiE '^amqp$' \ ;fi @@ -503,8 +503,8 @@ RUN if [ ${INSTALL_CASSANDRA} = true ]; then \ make clean >/dev/null && \ make >/dev/null 2>&1 && \ make install && \ - echo "extension=cassandra.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/cassandra.ini && \ - ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/cassandra.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/30-cassandra.ini; \ + echo "extension=cassandra.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/cassandra.ini && \ + ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/cassandra.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/30-cassandra.ini; \ fi \ ;fi @@ -518,7 +518,7 @@ RUN if [ ${INSTALL_GEARMAN} = true ]; then \ add-apt-repository -y ppa:ondrej/pkg-gearman && \ apt-get update && \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \ - apt-get install php${IVPLDOCK_PHP_VERSION}-gearman -y \ + apt-get install php${DEVDOCK_PHP_VERSION}-gearman -y \ ; else \ apt-get install php-gearman -y \ ;fi \ @@ -532,7 +532,7 @@ ARG INSTALL_PHPREDIS=false RUN if [ ${INSTALL_PHPREDIS} = true ]; then \ apt-get update \ - && apt-get install -yqq php${IVPLDOCK_PHP_VERSION}-redis \ + && apt-get install -yqq php${DEVDOCK_PHP_VERSION}-redis \ ;fi ########################################################################### @@ -557,8 +557,8 @@ RUN set -eux; \ else \ echo '' | pecl -q install swoole; \ fi; \ - echo "extension=swoole.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/swoole.ini; \ - ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/swoole.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/20-swoole.ini; \ + echo "extension=swoole.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/swoole.ini; \ + ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/swoole.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/20-swoole.ini; \ php -m | grep -q 'swoole'; \ fi @@ -574,8 +574,8 @@ RUN set -eux; \ # Install Php xlswriter Extension if [ $(php -r "echo PHP_MAJOR_VERSION;") != "5" ]; then \ echo '' | pecl -q install xlswriter && \ - echo "extension=xlswriter.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/xlswriter.ini && \ - ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/xlswriter.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/20-xlswriter.ini && \ + echo "extension=xlswriter.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/xlswriter.ini && \ + ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/xlswriter.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/20-xlswriter.ini && \ php -m | grep -q 'xlswriter'; \ else \ echo "PHP Extension for xlswriter is not supported for PHP 5.0"; \ @@ -593,8 +593,8 @@ RUN if [ "${INSTALL_TAINT}" = true ]; then \ # Install Php TAINT Extension if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \ pecl install taint && \ - echo "extension=taint.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/taint.ini && \ - ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/taint.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/20-taint.ini && \ + echo "extension=taint.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/taint.ini && \ + ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/taint.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/20-taint.ini && \ php -m | grep -q 'taint'; \ fi \ ;fi @@ -618,12 +618,12 @@ ARG INSTALL_INOTIFY=false RUN if [ ${INSTALL_INOTIFY} = true ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ pecl -q install inotify-0.1.6 && \ - echo "extension=inotify.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/inotify.ini && \ - ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/inotify.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/20-inotify.ini; \ + echo "extension=inotify.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/inotify.ini && \ + ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/inotify.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/20-inotify.ini; \ else \ pecl -q install inotify && \ - echo "extension=inotify.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/inotify.ini && \ - ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/inotify.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/20-inotify.ini \ + echo "extension=inotify.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/inotify.ini && \ + ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/inotify.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/20-inotify.ini \ ;fi \ ;fi @@ -640,8 +640,8 @@ RUN if [ ${INSTALL_AST} = true ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") != "5" ]; then \ # Install AST extension printf "\n" | pecl -q install ast-${AST_VERSION} && \ - echo "extension=ast.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/ast.ini && \ - phpenmod -v ${IVPLDOCK_PHP_VERSION} -s cli ast \ + echo "extension=ast.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/ast.ini && \ + phpenmod -v ${DEVDOCK_PHP_VERSION} -s cli ast \ ;fi \ ;fi @@ -675,14 +675,14 @@ RUN if [ ${INSTALL_GRAPHVIZ} = true ]; then \ ARG INSTALL_IONCUBE=false RUN if [ ${INSTALL_IONCUBE} = true ]; then \ - if [ ${IVPLDOCK_PHP_VERSION} != "8.3" ] \ - && [ ${IVPLDOCK_PHP_VERSION} != "8.0" ]; then \ + if [ ${DEVDOCK_PHP_VERSION} != "8.3" ] \ + && [ ${DEVDOCK_PHP_VERSION} != "8.0" ]; then \ # Install the php ioncube loader curl -L -o /tmp/ioncube_loaders_lin_x86-64.tar.gz https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz \ && tar zxpf /tmp/ioncube_loaders_lin_x86-64.tar.gz -C /tmp \ - && mv /tmp/ioncube/ioncube_loader_lin_${IVPLDOCK_PHP_VERSION}.so $(php -r "echo ini_get('extension_dir');")/ioncube_loader.so \ - && echo "zend_extension=ioncube_loader.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/ioncube.ini \ - && ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/ioncube.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/0ioncube.ini \ + && mv /tmp/ioncube/ioncube_loader_lin_${DEVDOCK_PHP_VERSION}.so $(php -r "echo ini_get('extension_dir');")/ioncube_loader.so \ + && echo "zend_extension=ioncube_loader.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/ioncube.ini \ + && ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/ioncube.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/0ioncube.ini \ && rm -rf /tmp/ioncube* \ && php -m | grep -oiE '^ionCube Loader$' \ ;fi \ @@ -703,7 +703,7 @@ RUN if [ ${INSTALL_DRUPAL_CONSOLE} = true ]; then \ chmod +x /usr/local/bin/drupal \ ;fi -USER ivpldock +USER devdock ########################################################################### # Node / NVM: @@ -728,7 +728,7 @@ ARG NPM_FETCH_RETRY_MINTIMEOUT ENV NPM_FETCH_RETRY_MINTIMEOUT ${NPM_FETCH_RETRY_MINTIMEOUT} ARG NPM_FETCH_RETRY_MAXTIMEOUT ENV NPM_FETCH_RETRY_MAXTIMEOUT ${NPM_FETCH_RETRY_MAXTIMEOUT} -ENV NVM_DIR /home/ivpldock/.nvm +ENV NVM_DIR /home/devdock/.nvm ARG NVM_NODEJS_ORG_MIRROR ENV NVM_NODEJS_ORG_MIRROR ${NVM_NODEJS_ORG_MIRROR} @@ -753,7 +753,7 @@ USER root RUN if [ ${INSTALL_NODE} = true ]; then \ echo "" >> ~/.bashrc && \ - echo 'export NVM_DIR="/home/ivpldock/.nvm"' >> ~/.bashrc && \ + echo 'export NVM_DIR="/home/devdock/.nvm"' >> ~/.bashrc && \ echo '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm' >> ~/.bashrc \ ;fi @@ -777,7 +777,7 @@ RUN if [ ${NPM_REGISTRY} ]; then \ # Mount .npmrc into home folder COPY ./.npmrc /root/.npmrc -COPY ./.npmrc /home/ivpldock/.npmrc +COPY ./.npmrc /home/devdock/.npmrc ########################################################################### @@ -787,12 +787,12 @@ COPY ./.npmrc /home/ivpldock/.npmrc USER root ARG INSTALL_PNPM=false -ENV PNPM_HOME="/home/ivpldock/.local/share/pnpm" -ENV PATH $PATH:/home/ivpldock/.local/share/pnpm +ENV PNPM_HOME="/home/devdock/.local/share/pnpm" +ENV PATH $PATH:/home/devdock/.local/share/pnpm RUN if [ ${INSTALL_PNPM} = true ]; then \ echo "" >> ~/.bashrc && \ - echo 'export PNPM_HOME="/home/ivpldock/.local/share/pnpm"' >> ~/.bashrc && \ + echo 'export PNPM_HOME="/home/devdock/.local/share/pnpm"' >> ~/.bashrc && \ echo 'export PATH="$PNPM_HOME:$PATH"' >> ~/.bashrc && \ npx pnpm add -g pnpm \ ;fi @@ -802,7 +802,7 @@ RUN if [ ${INSTALL_PNPM} = true ]; then \ # YARN: ########################################################################### -USER ivpldock +USER devdock ARG INSTALL_YARN=false ARG YARN_VERSION=latest @@ -824,12 +824,12 @@ USER root RUN if [ ${INSTALL_YARN} = true ]; then \ echo "" >> ~/.bashrc && \ - echo 'export YARN_DIR="/home/ivpldock/.yarn"' >> ~/.bashrc && \ + echo 'export YARN_DIR="/home/devdock/.yarn"' >> ~/.bashrc && \ echo 'export PATH="$YARN_DIR/bin:$PATH"' >> ~/.bashrc \ ;fi # Add PATH for YARN -ENV PATH $PATH:/home/ivpldock/.yarn/bin +ENV PATH $PATH:/home/devdock/.yarn/bin ########################################################################### # PHP Aerospike: @@ -872,9 +872,9 @@ RUN set -xe; \ ;fi \ ;fi \ && rm /tmp/aerospike-client-php.tar.gz \ - && echo 'extension=aerospike.so' >> /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/aerospike.ini \ - && echo 'aerospike.udf.lua_system_path=/usr/local/aerospike/lua' >> /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/aerospike.ini \ - && echo 'aerospike.udf.lua_user_path=/usr/local/aerospike/usr-lua' >> /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/aerospike.ini \ + && echo 'extension=aerospike.so' >> /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/aerospike.ini \ + && echo 'aerospike.udf.lua_system_path=/usr/local/aerospike/lua' >> /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/aerospike.ini \ + && echo 'aerospike.udf.lua_user_path=/usr/local/aerospike/usr-lua' >> /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/aerospike.ini \ ;fi ########################################################################### @@ -925,7 +925,7 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \ else \ echo "instantclient,/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/" | pecl install oci8; \ fi \ - && echo "extension=oci8.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/cli/php.ini \ + && echo "extension=oci8.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/cli/php.ini \ && php -m | grep -q 'oci8' \ ;fi @@ -947,7 +947,7 @@ RUN set -xe; \ else \ pecl install v8js; \ fi \ - && echo "extension=v8js.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/cli/php.ini \ + && echo "extension=v8js.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/cli/php.ini \ && php -m | grep -q 'v8js' \ ;fi @@ -955,7 +955,7 @@ RUN set -xe; \ # Laravel Envoy: ########################################################################### -USER ivpldock +USER devdock ARG INSTALL_LARAVEL_ENVOY=false @@ -969,7 +969,7 @@ RUN if [ ${INSTALL_LARAVEL_ENVOY} = true ]; then \ # Laravel Installer: ########################################################################### -USER ivpldock +USER devdock ARG INSTALL_LARAVEL_INSTALLER=false @@ -1084,8 +1084,8 @@ RUN set -eux; \ ;else \ pecl install pdo_sqlsrv sqlsrv \ ;fi && \ - echo "extension=pdo_sqlsrv.so" > /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/20-pdo_sqlsrv.ini && \ - echo "extension=sqlsrv.so" > /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/20-sqlsrv.ini && \ + echo "extension=pdo_sqlsrv.so" > /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/20-pdo_sqlsrv.ini && \ + echo "extension=sqlsrv.so" > /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/20-sqlsrv.ini && \ php -m | grep -oiE '^pdo_sqlsrv$' && \ php -m | grep -oiE '^sqlsrv$' \ ;fi \ @@ -1106,7 +1106,7 @@ RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \ ;fi\ ;fi -USER ivpldock +USER devdock ########################################################################### # Symfony: @@ -1183,7 +1183,7 @@ RUN if [ ${INSTALL_SUPERVISOR} = true ]; then \ ;fi \ ;fi -USER ivpldock +USER devdock ########################################################################### # ImageMagick: @@ -1214,8 +1214,8 @@ RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ else \ pecl install imagick; \ fi && \ - echo "extension=imagick.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/imagick.ini && \ - ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/imagick.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/20-imagick.ini && \ + echo "extension=imagick.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/imagick.ini && \ + ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/imagick.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/20-imagick.ini && \ php -m | grep -q 'imagick' \ ;fi @@ -1242,8 +1242,8 @@ RUN if [ ${INSTALL_TERRAFORM} = true ]; then \ ARG INSTALL_MEMCACHED=false RUN if [ ${INSTALL_MEMCACHED} = true ]; then \ - apt-get -y install php${IVPLDOCK_PHP_VERSION}-igbinary \ - && apt-get -y install php${IVPLDOCK_PHP_VERSION}-memcached \ + apt-get -y install php${DEVDOCK_PHP_VERSION}-igbinary \ + && apt-get -y install php${DEVDOCK_PHP_VERSION}-memcached \ ;fi ########################################################################### @@ -1296,16 +1296,16 @@ RUN if [ ${INSTALL_DUSK_DEPS} = true ]; then \ ########################################################################### ARG INSTALL_PHALCON=false -ARG IVPLDOCK_PHALCON_VERSION -ENV IVPLDOCK_PHALCON_VERSION ${IVPLDOCK_PHALCON_VERSION} +ARG DEVDOCK_PHALCON_VERSION +ENV DEVDOCK_PHALCON_VERSION ${DEVDOCK_PHALCON_VERSION} RUN if [ $INSTALL_PHALCON = true ]; then \ apt-get update -yqq \ && pecl channel-update pecl.php.net \ && apt-get install -yqq libpcre3-dev; \ - pecl install phalcon-${IVPLDOCK_PHALCON_VERSION}; \ - echo "extension=phalcon.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/phalcon.ini; \ - ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/50-phalcon.ini; \ + pecl install phalcon-${DEVDOCK_PHALCON_VERSION}; \ + echo "extension=phalcon.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/phalcon.ini; \ + ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/50-phalcon.ini; \ php -m | grep -q 'phalcon' \ ;fi @@ -1321,8 +1321,8 @@ RUN if [ ${INSTALL_APCU} = true ]; then \ else \ pecl install apcu; \ fi && \ - echo "extension=apcu.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/apcu.ini; \ - ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/apcu.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/50-apcu.ini; \ + echo "extension=apcu.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/apcu.ini; \ + ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/apcu.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/50-apcu.ini; \ php -m | grep -q 'apcu' \ ;fi @@ -1383,8 +1383,8 @@ RUN set -eux; \ else \ echo '' | pecl install yaml; \ fi; \ - echo "extension=yaml.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/yaml.ini; \ - ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/yaml.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/35-yaml.ini; \ + echo "extension=yaml.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/yaml.ini; \ + ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/yaml.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/35-yaml.ini; \ fi; \ ########################################################################### # RDKAFKA: @@ -1392,8 +1392,8 @@ RUN set -eux; \ if [ ${INSTALL_RDKAFKA} = true ]; then \ apt-get install -yqq librdkafka-dev; \ pecl install rdkafka; \ - echo "extension=rdkafka.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/rdkafka.ini; \ - ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/rdkafka.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/20-rdkafka.ini; \ + echo "extension=rdkafka.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/rdkafka.ini; \ + ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/rdkafka.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/20-rdkafka.ini; \ php -m | grep -q 'rdkafka'; \ fi; \ ########################################################################### @@ -1505,7 +1505,7 @@ RUN if [ ${INSTALL_GIT_PROMPT} = true ]; then \ ARG INSTALL_XMLRPC=false RUN if [ ${INSTALL_XMLRPC} = true ]; then \ - apt-get install -yqq php${IVPLDOCK_PHP_VERSION}-xmlrpc \ + apt-get install -yqq php${DEVDOCK_PHP_VERSION}-xmlrpc \ ;fi ########################################################################### @@ -1546,7 +1546,7 @@ RUN if [ ${INSTALL_PROTOC} = true ]; then \ # Check PHP version: ########################################################################### -RUN set -xe; php -v | head -n 1 | grep -q "PHP ${IVPLDOCK_PHP_VERSION}." +RUN set -xe; php -v | head -n 1 | grep -q "PHP ${DEVDOCK_PHP_VERSION}." ########################################################################### # Oh My ZSH! @@ -1562,10 +1562,10 @@ RUN if [ ${SHELL_OH_MY_ZSH} = true ]; then \ ARG SHELL_OH_MY_ZSH_AUTOSUGESTIONS=false ARG SHELL_OH_MY_ZSH_ALIASES=false -USER ivpldock +USER devdock RUN if [ ${SHELL_OH_MY_ZSH} = true ]; then \ sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh) --keep-zshrc" && \ - sed -i -r 's/^plugins=\(.*?\)$/plugins=(laravel composer)/' /home/ivpldock/.zshrc && \ + sed -i -r 's/^plugins=\(.*?\)$/plugins=(laravel composer)/' /home/devdock/.zshrc && \ echo '\n\ bindkey "^[OB" down-line-or-search\n\ bindkey "^[OC" forward-char\n\ @@ -1577,20 +1577,20 @@ bindkey "^[[3~" delete-char\n\ bindkey "^[[4~" end-of-line\n\ bindkey "^[[5~" up-line-or-history\n\ bindkey "^[[6~" down-line-or-history\n\ -bindkey "^?" backward-delete-char\n' >> /home/ivpldock/.zshrc && \ +bindkey "^?" backward-delete-char\n' >> /home/devdock/.zshrc && \ if [ ${SHELL_OH_MY_ZSH_AUTOSUGESTIONS} = true ]; then \ - sh -c "git clone https://github.com/zsh-users/zsh-autosuggestions /home/ivpldock/.oh-my-zsh/custom/plugins/zsh-autosuggestions" && \ - sed -i 's~plugins=(~plugins=(zsh-autosuggestions ~g' /home/ivpldock/.zshrc && \ - sed -i '1iZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20' /home/ivpldock/.zshrc && \ - sed -i '1iZSH_AUTOSUGGEST_STRATEGY=(history completion)' /home/ivpldock/.zshrc && \ - sed -i '1iZSH_AUTOSUGGEST_USE_ASYNC=1' /home/ivpldock/.zshrc && \ - sed -i '1iTERM=xterm-256color' /home/ivpldock/.zshrc \ + sh -c "git clone https://github.com/zsh-users/zsh-autosuggestions /home/devdock/.oh-my-zsh/custom/plugins/zsh-autosuggestions" && \ + sed -i 's~plugins=(~plugins=(zsh-autosuggestions ~g' /home/devdock/.zshrc && \ + sed -i '1iZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20' /home/devdock/.zshrc && \ + sed -i '1iZSH_AUTOSUGGEST_STRATEGY=(history completion)' /home/devdock/.zshrc && \ + sed -i '1iZSH_AUTOSUGGEST_USE_ASYNC=1' /home/devdock/.zshrc && \ + sed -i '1iTERM=xterm-256color' /home/devdock/.zshrc \ ;fi && \ if [ ${SHELL_OH_MY_ZSH_ALIASES} = true ]; then \ - echo "" >> /home/ivpldock/.zshrc && \ - echo "# Load Custom Aliases" >> /home/ivpldock/.zshrc && \ - echo "source /home/ivpldock/aliases.sh" >> /home/ivpldock/.zshrc && \ - echo "" >> /home/ivpldock/.zshrc \ + echo "" >> /home/devdock/.zshrc && \ + echo "# Load Custom Aliases" >> /home/devdock/.zshrc && \ + echo "source /home/devdock/aliases.sh" >> /home/devdock/.zshrc && \ + echo "" >> /home/devdock/.zshrc \ ;fi \ ;fi @@ -1603,19 +1603,19 @@ USER root USER root COPY ./aliases.sh /root/aliases.sh -COPY ./aliases.sh /home/ivpldock/aliases.sh +COPY ./aliases.sh /home/devdock/aliases.sh RUN if [ ${SHELL_OH_MY_ZSH} = true ]; then \ sed -i 's/\r//' /root/aliases.sh && \ - sed -i 's/\r//' /home/ivpldock/aliases.sh && \ - chown ivpldock:ivpldock /home/ivpldock/aliases.sh && \ + sed -i 's/\r//' /home/devdock/aliases.sh && \ + chown devdock:devdock /home/devdock/aliases.sh && \ echo "" >> ~/.zshrc && \ echo "# Load Custom Aliases" >> ~/.zshrc && \ echo "source ~/aliases.sh" >> ~/.zshrc && \ echo "" >> ~/.zshrc \ ;fi -USER ivpldock +USER devdock RUN if [ ${SHELL_OH_MY_ZSH} = true ]; then \ echo "" >> ~/.zshrc && \ @@ -1641,8 +1641,8 @@ RUN if [ ${INSTALL_PHPDECIMAL} = true ]; then \ else \ apt-get install -yqq libmpdec-dev \ && pecl install decimal \ - && echo "extension=decimal.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/decimal.ini \ - && ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/decimal.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/30-decimal.ini \ + && echo "extension=decimal.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/decimal.ini \ + && ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/decimal.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/30-decimal.ini \ && php -m | grep -q 'decimal' \ ;fi \ ;fi @@ -1668,8 +1668,8 @@ RUN set -eux; \ pecl install zookeeper-0.7.2; \ fi; \ fi; \ - echo "extension=zookeeper.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/zookeeper.ini; \ - ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/zookeeper.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/30-zookeeper.ini; \ + echo "extension=zookeeper.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/zookeeper.ini; \ + ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/zookeeper.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/30-zookeeper.ini; \ php -m | grep -q 'zookeeper'; \ fi @@ -1710,8 +1710,8 @@ ARG INSTALL_TRADER=false RUN if [ ${INSTALL_TRADER} = true ]; then \ pecl install trader \ - && echo "extension=trader.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/trader.ini \ - && ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/trader.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/20-trader.ini \ + && echo "extension=trader.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/trader.ini \ + && ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/trader.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/20-trader.ini \ ;fi # @@ -1734,8 +1734,8 @@ RUN if [ ${INSTALL_ZMQ} = true ]; then \ && make install \ && cd .. \ && rm -fr php-zmq \ - && echo "extension=zmq.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/zmq.ini \ - && ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/zmq.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/20-zmq.ini \ + && echo "extension=zmq.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/zmq.ini \ + && ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/zmq.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/20-zmq.ini \ ;fi ############################################################################ @@ -1755,10 +1755,10 @@ RUN set -eux; \ make &&\ make install &&\ rm /tmp/libevent.tar.gz &&\ - if [ ! -f /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/sockets.ini ]; then\ - echo "extension=sockets.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/sockets.ini; \ + if [ ! -f /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/sockets.ini ]; then\ + echo "extension=sockets.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/sockets.ini; \ fi &&\ - ln -sf /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/sockets.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/20-sockets.ini && \ + ln -sf /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/sockets.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/20-sockets.ini && \ curl -L -o /tmp/event.tar.gz http://pecl.php.net/get/event-3.0.6.tgz &&\ mkdir -p /tmp/event-php &&\ tar -C /tmp/event-php -zxvf /tmp/event.tar.gz --strip 1 &&\ @@ -1768,8 +1768,8 @@ RUN set -eux; \ make &&\ make install &&\ rm /tmp/event.tar.gz &&\ - echo "extension=event.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/event.ini && \ - ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/event.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/30-event.ini && \ + echo "extension=event.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/event.ini && \ + ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/event.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/30-event.ini && \ php -m | grep -q 'event' \ ;fi diff --git a/.docker/workspace/Dockerfile.81 b/.docker/workspace/Dockerfile.81 index f40f41e..973cf31 100644 --- a/.docker/workspace/Dockerfile.81 +++ b/.docker/workspace/Dockerfile.81 @@ -7,18 +7,18 @@ # https://github.com/Laradock/workspace # # To change its version, see the available Tags on the Docker Hub: -# https://hub.docker.com/r/ivpldock/workspace/tags/ +# https://hub.docker.com/r/devdock/workspace/tags/ # # Note: Base Image name format {image-tag}-{php-version} # -ARG IVPLDOCK_PHP_VERSION +ARG DEVDOCK_PHP_VERSION ARG BASE_IMAGE_TAG_PREFIX=latest -FROM laradock/workspace:${BASE_IMAGE_TAG_PREFIX}-${IVPLDOCK_PHP_VERSION} +FROM laradock/workspace:${BASE_IMAGE_TAG_PREFIX}-${DEVDOCK_PHP_VERSION} LABEL maintainer="Mahmoud Zalt " -ARG IVPLDOCK_PHP_VERSION +ARG DEVDOCK_PHP_VERSION # Set Environment Variables ENV DEBIAN_FRONTEND noninteractive @@ -27,7 +27,7 @@ ENV DEBIAN_FRONTEND noninteractive USER root # Set up default environment variables, sourcing from .env where possible -ARG IVPLDOCK_USER +ARG DEVDOCK_USER ARG WORKSPACE_WORKDIR ARG TIMEZONE ARG NODE_VERSION @@ -43,7 +43,7 @@ ENV DEBIAN_FRONTEND=noninteractive \ TZ=${TIMEZONE:-UTC} \ PUID=1000 \ PGID=1000 \ - IVPLDOCK_USER=${IVPLDOCK_USER:-ivpldock} \ + DEVDOCK_USER=${DEVDOCK_USER:-devdock} \ WORKDIR=${WORKSPACE_WORKDIR:-/var/www/projects} \ NODE_VERSION=${NODE_VERSION:-18} \ XDEBUG_PORT=${XDEBUG_PORT:-9003} \ @@ -53,9 +53,9 @@ ENV DEBIAN_FRONTEND=noninteractive \ RUN set -xe; \ apt-get update -yqq && \ pecl channel-update pecl.php.net && \ - groupadd -g ${PGID} ivpldock && \ - useradd -l -u ${PUID} -g ivpldock -m ivpldock -G docker_env && \ - usermod -p "*" ivpldock -s /bin/bash && \ + groupadd -g ${PGID} devdock && \ + useradd -l -u ${PUID} -g devdock -m devdock -G docker_env && \ + usermod -p "*" devdock -s /bin/bash && \ apt-get install -yqq \ apt-utils \ # @@ -64,14 +64,14 @@ RUN set -xe; \ #-------------------------------------------------------------------------- # # Mandatory Software's such as ("php-cli", "git", "vim", ....) are - # installed on the base image 'ivpldock/workspace' image. If you want + # installed on the base image 'devdock/workspace' image. If you want # to add more Software's or remove existing one, you need to edit the # base image (https://github.com/Laradock/workspace). # - # next lines are here because there is no auto build on dockerhub see https://github.com/ivpldock/ivpldock/pull/1903#issuecomment-463142846 + # next lines are here because there is no auto build on dockerhub see https://github.com/devdock/devdock/pull/1903#issuecomment-463142846 libzip-dev zip unzip \ # Install the zip extension - php${IVPLDOCK_PHP_VERSION}-zip \ + php${DEVDOCK_PHP_VERSION}-zip \ # nasm nasm && \ php -m | grep -q 'zip' @@ -104,18 +104,18 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone USER root COPY ./aliases.sh /root/aliases.sh -COPY ./aliases.sh /home/ivpldock/aliases.sh +COPY ./aliases.sh /home/devdock/aliases.sh RUN sed -i 's/\r//' /root/aliases.sh && \ - sed -i 's/\r//' /home/ivpldock/aliases.sh && \ - chown ivpldock:ivpldock /home/ivpldock/aliases.sh && \ + sed -i 's/\r//' /home/devdock/aliases.sh && \ + chown devdock:devdock /home/devdock/aliases.sh && \ echo "" >> ~/.bashrc && \ echo "# Load Custom Aliases" >> ~/.bashrc && \ echo "export PS1='\W\$ '" >> ~/.bashrc && \ echo "source ~/aliases.sh" >> ~/.bashrc && \ echo "" >> ~/.bashrc -USER ivpldock +USER devdock RUN echo "" >> ~/.bashrc && \ echo "# Load Custom Aliases" >> ~/.bashrc && \ @@ -130,13 +130,13 @@ RUN echo "" >> ~/.bashrc && \ USER root # Add the composer.json -COPY ./composer.json /home/ivpldock/.composer/composer.json +COPY ./composer.json /home/devdock/.composer/composer.json # Add the auth.json for magento 2 credentials -COPY ./auth.json /home/ivpldock/.composer/auth.json +COPY ./auth.json /home/devdock/.composer/auth.json -# Make sure that ~/.composer belongs to ivpldock -RUN chown -R ivpldock:ivpldock /home/ivpldock/.composer +# Make sure that ~/.composer belongs to devdock +RUN chown -R devdock:devdock /home/devdock/.composer # Export composer vendor path RUN echo "" >> ~/.bashrc && \ @@ -148,7 +148,7 @@ ENV COMPOSER_VERSION ${COMPOSER_VERSION} RUN set -eux; \ composer self-update --${COMPOSER_VERSION}; -USER ivpldock +USER devdock # Check if global install need to be ran ARG COMPOSER_GLOBAL_INSTALL=false @@ -165,7 +165,7 @@ ENV COMPOSER_AUTH_JSON ${COMPOSER_AUTH_JSON} RUN if [ ${COMPOSER_AUTH_JSON} = false ]; then \ # remove the file - rm /home/ivpldock/.composer/auth.json \ + rm /home/devdock/.composer/auth.json \ ;fi ARG COMPOSER_REPO_PACKAGIST @@ -184,7 +184,7 @@ RUN echo "" >> ~/.bashrc && \ ########################################################################### # add ./vendor/bin to non-root user's bashrc (needed for phpunit) -USER ivpldock +USER devdock RUN echo "" >> ~/.bashrc && \ echo 'export PATH="/var/www/vendor/bin:$PATH"' >> ~/.bashrc @@ -208,48 +208,48 @@ ARG INSTALL_GNUPG=false ARG INSTALL_SSH2=false ARG INSTALL_SOAP=false ARG INSTALL_XSL=false -ARG PHP_VERSION=${IVPLDOCK_PHP_VERSION} +ARG PHP_VERSION=${DEVDOCK_PHP_VERSION} RUN set -eux; \ ########################################################################### # BZ2: ########################################################################### if [ ${INSTALL_BZ2} = true ]; then \ - apt-get -yqq install php${IVPLDOCK_PHP_VERSION}-bz2; \ + apt-get -yqq install php${DEVDOCK_PHP_VERSION}-bz2; \ fi; \ ########################################################################### # GMP (GNU Multiple Precision): ########################################################################### if [ ${INSTALL_GMP} = true ]; then \ # Install the PHP GMP extension - apt-get -yqq install php${IVPLDOCK_PHP_VERSION}-gmp; \ + apt-get -yqq install php${DEVDOCK_PHP_VERSION}-gmp; \ fi; \ ########################################################################### # GnuPG: ########################################################################### if [ ${INSTALL_GNUPG} = true ]; then \ - apt-get -yqq install php${IVPLDOCK_PHP_VERSION}-gnupg; \ + apt-get -yqq install php${DEVDOCK_PHP_VERSION}-gnupg; \ fi; \ ########################################################################### # SSH2: ########################################################################### if [ ${INSTALL_SSH2} = true ]; then \ # Install the PHP SSH2 extension - apt-get -yqq install libssh2-1-dev php${IVPLDOCK_PHP_VERSION}-ssh2; \ + apt-get -yqq install libssh2-1-dev php${DEVDOCK_PHP_VERSION}-ssh2; \ fi; \ ########################################################################### # SOAP: ########################################################################### if [ ${INSTALL_SOAP} = true ]; then \ # Install the PHP SOAP extension - apt-get -yqq install libxml2-dev php${IVPLDOCK_PHP_VERSION}-soap; \ + apt-get -yqq install libxml2-dev php${DEVDOCK_PHP_VERSION}-soap; \ fi; \ ########################################################################### # XSL: ########################################################################### if [ ${INSTALL_XSL} = true ]; then \ # Install the PHP XSL extension - apt-get -yqq install libxslt-dev php${IVPLDOCK_PHP_VERSION}-xsl; \ + apt-get -yqq install libxslt-dev php${DEVDOCK_PHP_VERSION}-xsl; \ fi ########################################################################### @@ -264,7 +264,7 @@ RUN set -eux; \ # IMAP: ########################################################################### if [ ${INSTALL_IMAP} = true ]; then \ - apt-get install -yqq php${IVPLDOCK_PHP_VERSION}-imap; \ + apt-get install -yqq php${DEVDOCK_PHP_VERSION}-imap; \ fi; ########################################################################### @@ -280,31 +280,31 @@ ARG INSTALL_XDEBUG=false ARG XDEBUG_CLIENT_HOST ARG XDEBUG_PORT=9003 -RUN apt-get install -yqq pkg-config php-xml php${IVPLDOCK_PHP_VERSION}-xml && \ +RUN apt-get install -yqq pkg-config php-xml php${DEVDOCK_PHP_VERSION}-xml && \ pecl install xdebug-3.3.0 && \ - echo "zend_extension=xdebug.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/20-xdebug.ini + echo "zend_extension=xdebug.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/20-xdebug.ini RUN echo "##### PHP Version #####" \ - ${IVPLDOCK_PHP_VERSION} \ + ${DEVDOCK_PHP_VERSION} \ "##### /PHP Version #####" # ADD for REMOTE debugging -COPY ./xdebug.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini +COPY ./xdebug.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini RUN if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \ - sed -i "s/xdebug.remote_host=/xdebug.client_host=/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ - sed -i "s/xdebug.remote_connect_back=0/xdebug.discover_client_host=false/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ - sed -i "s/xdebug.remote_port=9000/xdebug.client_port=${XDEBUG_PORT}/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ - sed -i "s/xdebug.profiler_enable=0/; xdebug.profiler_enable=0/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ - sed -i "s/xdebug.profiler_output_dir=/xdebug.output_dir=/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ - sed -i "s/xdebug.remote_mode=req/; xdebug.remote_mode=req/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ - sed -i "s/xdebug.remote_autostart=0/xdebug.start_with_request=yes/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ - sed -i "s/xdebug.remote_enable=0/xdebug.mode=debug/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini \ + sed -i "s/xdebug.remote_host=/xdebug.client_host=/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ + sed -i "s/xdebug.remote_connect_back=0/xdebug.discover_client_host=false/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ + sed -i "s/xdebug.remote_port=9000/xdebug.client_port=${XDEBUG_PORT}/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ + sed -i "s/xdebug.profiler_enable=0/; xdebug.profiler_enable=0/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ + sed -i "s/xdebug.profiler_output_dir=/xdebug.output_dir=/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ + sed -i "s/xdebug.remote_mode=req/; xdebug.remote_mode=req/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ + sed -i "s/xdebug.remote_autostart=0/xdebug.start_with_request=yes/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ + sed -i "s/xdebug.remote_enable=0/xdebug.mode=debug/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini \ ;else \ - sed -i "s/xdebug.remote_autostart=0/xdebug.remote_autostart=1/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ - sed -i "s/xdebug.remote_enable=0/xdebug.remote_enable=1/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini \ + sed -i "s/xdebug.remote_autostart=0/xdebug.remote_autostart=1/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \ + sed -i "s/xdebug.remote_enable=0/xdebug.remote_enable=1/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini \ ;fi -RUN sed -i "s/xdebug.cli_color=0/xdebug.cli_color=1/" /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini +RUN sed -i "s/xdebug.cli_color=0/xdebug.cli_color=1/" /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/xdebug.ini ########################################################################### # pcov: @@ -314,9 +314,9 @@ USER root # Install pcov for code coverage RUN pecl install pcov && \ - echo "extension=pcov.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/20-pcov.ini + echo "extension=pcov.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/20-pcov.ini -#echo "pcov.enabled" >> /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/20-pcov.ini +#echo "pcov.enabled" >> /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/20-pcov.ini ########################################################################### # PHPREDIS EXTENSION @@ -326,7 +326,7 @@ ARG INSTALL_PHPREDIS=false RUN if [ ${INSTALL_PHPREDIS} = true ]; then \ apt-get update \ - && apt-get install -yqq php${IVPLDOCK_PHP_VERSION}-redis \ + && apt-get install -yqq php${DEVDOCK_PHP_VERSION}-redis \ ;fi ########################################################################### @@ -348,12 +348,12 @@ ARG INSTALL_INOTIFY=false RUN if [ ${INSTALL_INOTIFY} = true ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ pecl -q install inotify-0.1.6 && \ - echo "extension=inotify.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/inotify.ini && \ - ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/inotify.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/20-inotify.ini; \ + echo "extension=inotify.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/inotify.ini && \ + ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/inotify.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/20-inotify.ini; \ else \ pecl -q install inotify && \ - echo "extension=inotify.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/inotify.ini && \ - ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/inotify.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/20-inotify.ini \ + echo "extension=inotify.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/inotify.ini && \ + ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/inotify.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/20-inotify.ini \ ;fi \ ;fi @@ -370,7 +370,7 @@ RUN if [ ${INSTALL_FSWATCH} = true ]; then \ && apt-get -y install fswatch \ ;fi -USER ivpldock +USER devdock ########################################################################### # Node / NVM: @@ -392,7 +392,7 @@ ARG NPM_FETCH_RETRY_MINTIMEOUT ENV NPM_FETCH_RETRY_MINTIMEOUT ${NPM_FETCH_RETRY_MINTIMEOUT} ARG NPM_FETCH_RETRY_MAXTIMEOUT ENV NPM_FETCH_RETRY_MAXTIMEOUT ${NPM_FETCH_RETRY_MAXTIMEOUT} -ENV NVM_DIR /home/ivpldock/.nvm +ENV NVM_DIR /home/devdock/.nvm ARG NVM_NODEJS_ORG_MIRROR ENV NVM_NODEJS_ORG_MIRROR ${NVM_NODEJS_ORG_MIRROR} @@ -414,7 +414,7 @@ RUN echo "" >> ~/.bashrc && \ USER root RUN echo "" >> ~/.bashrc && \ - echo 'export NVM_DIR="/home/ivpldock/.nvm"' >> ~/.bashrc && \ + echo 'export NVM_DIR="/home/devdock/.nvm"' >> ~/.bashrc && \ echo '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm' >> ~/.bashrc # Make it so the node modules can be executed with 'docker-compose exec' @@ -427,13 +427,13 @@ RUN find $NVM_DIR -type f -name node -exec ln -s {} /usr/local/bin/node \; && \ # Mount .npmrc into home folder COPY ./.npmrc /root/.npmrc -COPY ./.npmrc /home/${IVPLDOCK_USER}/.npmrc +COPY ./.npmrc /home/${DEVDOCK_USER}/.npmrc ########################################################################### # YARN: ########################################################################### -USER ${IVPLDOCK_USER} +USER ${DEVDOCK_USER} ARG INSTALL_YARN=false ARG YARN_VERSION=latest @@ -450,11 +450,11 @@ RUN [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" && \ USER root RUN echo "" >> ~/.bashrc && \ - echo 'export YARN_DIR="/home/${IVPLDOCK_USER}/.yarn"' >> ~/.bashrc && \ + echo 'export YARN_DIR="/home/${DEVDOCK_USER}/.yarn"' >> ~/.bashrc && \ echo 'export PATH="$YARN_DIR/bin:$PATH"' >> ~/.bashrc # Add PATH for YARN -ENV PATH $PATH:/home/${IVPLDOCK_USER}/.yarn/bin +ENV PATH $PATH:/home/${DEVDOCK_USER}/.yarn/bin USER root @@ -473,7 +473,7 @@ RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \ ;fi\ ;fi -USER ivpldock +USER devdock ########################################################################### # PYTHON2: @@ -506,7 +506,7 @@ RUN if [ ${INSTALL_PYTHON3} = true ]; then \ && python3 -m pip install --upgrade virtualenv \ ;fi -USER ivpldock +USER devdock ########################################################################### # ImageMagick: @@ -537,8 +537,8 @@ RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ else \ pecl install imagick; \ fi && \ - echo "extension=imagick.so" >> /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/imagick.ini && \ - ln -s /etc/php/${IVPLDOCK_PHP_VERSION}/mods-available/imagick.ini /etc/php/${IVPLDOCK_PHP_VERSION}/cli/conf.d/20-imagick.ini && \ + echo "extension=imagick.so" >> /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/imagick.ini && \ + ln -s /etc/php/${DEVDOCK_PHP_VERSION}/mods-available/imagick.ini /etc/php/${DEVDOCK_PHP_VERSION}/cli/conf.d/20-imagick.ini && \ php -m | grep -q 'imagick' \ ;fi @@ -601,7 +601,7 @@ RUN if [ ${INSTALL_GIT_PROMPT} = true ]; then \ # Check PHP version: ########################################################################### -RUN set -xe; php -v | head -n 1 | grep -q "PHP ${IVPLDOCK_PHP_VERSION}." +RUN set -xe; php -v | head -n 1 | grep -q "PHP ${DEVDOCK_PHP_VERSION}." ########################################################################### # Oh My ZSH! @@ -617,10 +617,10 @@ RUN if [ ${SHELL_OH_MY_ZSH} = true ]; then \ ARG SHELL_OH_MY_ZSH_AUTOSUGESTIONS=false ARG SHELL_OH_MY_ZSH_ALIASES=false -USER ivpldock +USER devdock RUN if [ ${SHELL_OH_MY_ZSH} = true ]; then \ sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh) --keep-zshrc" && \ - sed -i -r 's/^plugins=\(.*?\)$/plugins=(laravel composer)/' /home/ivpldock/.zshrc && \ + sed -i -r 's/^plugins=\(.*?\)$/plugins=(laravel composer)/' /home/devdock/.zshrc && \ echo '\n\ bindkey "^[OB" down-line-or-search\n\ bindkey "^[OC" forward-char\n\ @@ -632,20 +632,20 @@ bindkey "^[[3~" delete-char\n\ bindkey "^[[4~" end-of-line\n\ bindkey "^[[5~" up-line-or-history\n\ bindkey "^[[6~" down-line-or-history\n\ -bindkey "^?" backward-delete-char\n' >> /home/ivpldock/.zshrc && \ +bindkey "^?" backward-delete-char\n' >> /home/devdock/.zshrc && \ if [ ${SHELL_OH_MY_ZSH_AUTOSUGESTIONS} = true ]; then \ - sh -c "git clone https://github.com/zsh-users/zsh-autosuggestions /home/ivpldock/.oh-my-zsh/custom/plugins/zsh-autosuggestions" && \ - sed -i 's~plugins=(~plugins=(zsh-autosuggestions ~g' /home/ivpldock/.zshrc && \ - sed -i '1iZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20' /home/ivpldock/.zshrc && \ - sed -i '1iZSH_AUTOSUGGEST_STRATEGY=(history completion)' /home/ivpldock/.zshrc && \ - sed -i '1iZSH_AUTOSUGGEST_USE_ASYNC=1' /home/ivpldock/.zshrc && \ - sed -i '1iTERM=xterm-256color' /home/ivpldock/.zshrc \ + sh -c "git clone https://github.com/zsh-users/zsh-autosuggestions /home/devdock/.oh-my-zsh/custom/plugins/zsh-autosuggestions" && \ + sed -i 's~plugins=(~plugins=(zsh-autosuggestions ~g' /home/devdock/.zshrc && \ + sed -i '1iZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20' /home/devdock/.zshrc && \ + sed -i '1iZSH_AUTOSUGGEST_STRATEGY=(history completion)' /home/devdock/.zshrc && \ + sed -i '1iZSH_AUTOSUGGEST_USE_ASYNC=1' /home/devdock/.zshrc && \ + sed -i '1iTERM=xterm-256color' /home/devdock/.zshrc \ ;fi && \ if [ ${SHELL_OH_MY_ZSH_ALIASES} = true ]; then \ - echo "" >> /home/ivpldock/.zshrc && \ - echo "# Load Custom Aliases" >> /home/ivpldock/.zshrc && \ - echo "source /home/ivpldock/aliases.sh" >> /home/ivpldock/.zshrc && \ - echo "" >> /home/ivpldock/.zshrc \ + echo "" >> /home/devdock/.zshrc && \ + echo "# Load Custom Aliases" >> /home/devdock/.zshrc && \ + echo "source /home/devdock/aliases.sh" >> /home/devdock/.zshrc && \ + echo "" >> /home/devdock/.zshrc \ ;fi \ ;fi @@ -658,19 +658,19 @@ USER root USER root COPY ./aliases.sh /root/aliases.sh -COPY ./aliases.sh /home/ivpldock/aliases.sh +COPY ./aliases.sh /home/devdock/aliases.sh RUN if [ ${SHELL_OH_MY_ZSH} = true ]; then \ sed -i 's/\r//' /root/aliases.sh && \ - sed -i 's/\r//' /home/ivpldock/aliases.sh && \ - chown ivpldock:ivpldock /home/ivpldock/aliases.sh && \ + sed -i 's/\r//' /home/devdock/aliases.sh && \ + chown devdock:devdock /home/devdock/aliases.sh && \ echo "" >> ~/.zshrc && \ echo "# Load Custom Aliases" >> ~/.zshrc && \ echo "source ~/aliases.sh" >> ~/.zshrc && \ echo "" >> ~/.zshrc \ ;fi -USER ivpldock +USER devdock RUN if [ ${SHELL_OH_MY_ZSH} = true ]; then \ echo "" >> ~/.zshrc && \ diff --git a/.docker/workspace/xdebug.ini b/.docker/workspace/xdebug.ini index 3e6346e..b5922bb 100644 --- a/.docker/workspace/xdebug.ini +++ b/.docker/workspace/xdebug.ini @@ -7,7 +7,7 @@ xdebug.start_with_request=yes xdebug.client_host=host.docker.internal xdebug.client_port=9003 xdebug.discover_client_host=false -xdebug.idekey=ivpldock +xdebug.idekey=devdock ; Logging (Optional, Useful for Debugging Issues) xdebug.log=/tmp/xdebug.log diff --git a/.env.example b/.env.example index f24e923..c8b1eb8 100644 --- a/.env.example +++ b/.env.example @@ -14,7 +14,7 @@ APP_CODE_PATH_CONTAINER=/var/www/projects APP_CODE_CONTAINER_FLAG=:cached # Choose storage path on your machine. For all storage systems -DATA_PATH_HOST=~/.ivpldock/data +DATA_PATH_HOST=~/.devdock/data ### Drivers ################################################ @@ -32,8 +32,8 @@ COMPOSE_FILE=docker-compose.yml # Change the separator from : to ; on Windows COMPOSE_PATH_SEPARATOR=: -# Define the prefix of container names. This is useful if you have multiple projects that use ivpldock to have separate containers per project. -COMPOSE_PROJECT_NAME=ivpldock +# Define the prefix of container names. This is useful if you have multiple projects that use devdock to have separate containers per project. +COMPOSE_PROJECT_NAME=devdock ### PHP Version ########################################### @@ -58,8 +58,8 @@ DOCKER_HOST_IP=10.0.75.1 ### Remote Interpreter #################################### -# Choose a Remote Interpreter entry matching name. Default is `ivpldock` -PHP_IDE_CONFIG=serverName=ivpldock +# Choose a Remote Interpreter entry matching name. Default is `devdock` +PHP_IDE_CONFIG=serverName=devdock ### PHP USE LEGACY OPENSSL ################################ @@ -537,8 +537,8 @@ SELENIUM_PORT=4444 MINIO_PORT=9000 MINIO_CONSOLE_PORT=9001 -MINIO_ROOT_USER=ivpldock -MINIO_ROOT_PASSWORD=ivpldock +MINIO_ROOT_USER=devdock +MINIO_ROOT_PASSWORD=devdock ### ADMINER ############################################### @@ -601,9 +601,9 @@ JENKINS_HOME=./jenkins/jenkins_home ### CONFLUENCE ############################################### CONFLUENCE_POSTGRES_INIT=true CONFLUENCE_VERSION=6.13-ubuntu-18.04-adoptopenjdk8 -CONFLUENCE_POSTGRES_DB=ivpldock_confluence -CONFLUENCE_POSTGRES_USER=ivpldock_confluence -CONFLUENCE_POSTGRES_PASSWORD=ivpldock_confluence +CONFLUENCE_POSTGRES_DB=devdock_confluence +CONFLUENCE_POSTGRES_USER=devdock_confluence +CONFLUENCE_POSTGRES_PASSWORD=devdock_confluence CONFLUENCE_HOST_HTTP_PORT=8090 ### GRAFANA ############################################### @@ -783,12 +783,12 @@ GITLAB_HOST_HTTP_PORT=8989 GITLAB_HOST_HTTPS_PORT=9898 GITLAB_HOST_SSH_PORT=2289 GITLAB_DOMAIN_NAME=http://localhost -GITLAB_ROOT_PASSWORD=ivpldock +GITLAB_ROOT_PASSWORD=devdock GITLAB_HOST_LOG_PATH=./logs/gitlab GITLAB_POSTGRES_HOST=postgres -GITLAB_POSTGRES_USER=ivpldock_gitlab -GITLAB_POSTGRES_PASSWORD=ivpldock_gitlab -GITLAB_POSTGRES_DB=ivpldock_gitlab +GITLAB_POSTGRES_USER=devdock_gitlab +GITLAB_POSTGRES_PASSWORD=devdock_gitlab +GITLAB_POSTGRES_DB=devdock_gitlab ### GITLAB-RUNNER ############################################### GITLAB_CI_SERVER_URL=http://localhost:8989 @@ -798,11 +798,11 @@ GITLAB_REGISTER_NON_INTERACTIVE=true ### JUPYTERHUB ############################################### JUPYTERHUB_POSTGRES_INIT=true JUPYTERHUB_POSTGRES_HOST=postgres -JUPYTERHUB_POSTGRES_USER=ivpldock_jupyterhub -JUPYTERHUB_POSTGRES_PASSWORD=ivpldock_jupyterhub -JUPYTERHUB_POSTGRES_DB=ivpldock_jupyterhub +JUPYTERHUB_POSTGRES_USER=devdock_jupyterhub +JUPYTERHUB_POSTGRES_PASSWORD=devdock_jupyterhub +JUPYTERHUB_POSTGRES_DB=devdock_jupyterhub JUPYTERHUB_PORT=9991 -JUPYTERHUB_OAUTH_CALLBACK_URL=http://ivpldock:9991/hub/oauth_callback +JUPYTERHUB_OAUTH_CALLBACK_URL=http://devdock:9991/hub/oauth_callback JUPYTERHUB_OAUTH_CLIENT_ID={GITHUB_CLIENT_ID} JUPYTERHUB_OAUTH_CLIENT_SECRET={GITHUB_CLIENT_SECRET} JUPYTERHUB_CUSTOM_CONFIG=./jupyterhub/jupyterhub_config.py @@ -817,8 +817,8 @@ LARADOCK_IPYTHON_CONTROLLER_IP=127.0.0.1 NETDATA_PORT=19999 ### REDISWEBUI ######################################### -REDIS_WEBUI_USERNAME=ivpldock -REDIS_WEBUI_PASSWORD=ivpldock +REDIS_WEBUI_USERNAME=devdock +REDIS_WEBUI_PASSWORD=devdock REDIS_WEBUI_CONNECT_HOST=redis REDIS_WEBUI_CONNECT_PORT=6379 REDIS_WEBUI_PORT=9987 @@ -859,8 +859,8 @@ MAILU_RECAPTCHA_PRIVATE_KEY="" MAILU_HTTP_PORT=6080 MAILU_HTTPS_PORT=60443 MAILU_DOMAIN=example.com -MAILU_INIT_ADMIN_USERNAME=ivpldock -MAILU_INIT_ADMIN_PASSWORD=ivpldock +MAILU_INIT_ADMIN_USERNAME=devdock +MAILU_INIT_ADMIN_PASSWORD=devdock # Hostnames for this server, separated with comas MAILU_HOSTNAMES=mail.example.com,alternative.example.com,yetanother.example.com # Postmaster local part (will append the main mail domain) @@ -1080,9 +1080,9 @@ KEYCLOAK_CREATE_ADMIN_USER=true KEYCLOAK_ADMIN_USER='admin' KEYCLOAK_ADMIN_PASSWORD='secret' KEYCLOAK_POSTGRES_HOST=postgres -KEYCLOAK_POSTGRES_USER=ivpldock_keycloak -KEYCLOAK_POSTGRES_PASSWORD=ivpldock_keycloak -KEYCLOAK_POSTGRES_DB=ivpldock_keycloak +KEYCLOAK_POSTGRES_USER=devdock_keycloak +KEYCLOAK_POSTGRES_PASSWORD=devdock_keycloak +KEYCLOAK_POSTGRES_DB=devdock_keycloak ### Mailpit ################################################# MAILPIT_HTTP_PORT=8125 diff --git a/README.md b/README.md index 92c2758..72bc2c8 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ We've simplified this for you with a bash script: ## Getting inside a container Normally you get into a container with the following command: -`docker-compose exec --user=ivpldock workspace bash` +`docker-compose exec --user=devdock workspace bash` We've simplified this for you with a bash script: `./workmeup.sh` will get you inside a container (on Linux and on Mac) diff --git a/buildmeup.sh b/buildmeup.sh index 3eefc14..bf8c7da 100755 --- a/buildmeup.sh +++ b/buildmeup.sh @@ -1,2 +1,2 @@ #!/bin/bash -docker-compose --env-file .env.docker up beanstalkd beanstalkd-console mariadb nginx php-fpm php-worker phpmyadmin redis workspace --build +docker compose --env-file .env.docker up beanstalkd beanstalkd-console mariadb nginx php-fpm php-worker phpmyadmin redis workspace --build diff --git a/docker-compose.yml b/docker-compose.yml index 6efa875..76238e4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,10 +25,10 @@ services: - SHELL_OH_MY_ZSH_AUTOSUGESTIONS=${SHELL_OH_MY_ZSH_AUTOSUGESTIONS} - SHELL_OH_MY_ZSH_ALIASES=${SHELL_OH_MY_ZSH_ALIASES} - BASE_IMAGE_TAG_PREFIX=${WORKSPACE_BASE_IMAGE_TAG_PREFIX} - - IVPLDOCK_USER=${IVPLDOCK_USER} - - IVPLDOCK_PHP_VERSION=${PHP_VERSION} + - DEVDOCK_USER=${DEVDOCK_USER} + - DEVDOCK_PHP_VERSION=${PHP_VERSION} - WORKSPACE_WORKDIR=${APP_CODE_PATH_CONTAINER} - - IVPLDOCK_PHALCON_VERSION=${PHALCON_VERSION} + - DEVDOCK_PHALCON_VERSION=${PHALCON_VERSION} - INSTALL_SUBVERSION=${WORKSPACE_INSTALL_SUBVERSION} - INSTALL_BZ2=${WORKSPACE_INSTALL_BZ2} - INSTALL_GMP=${WORKSPACE_INSTALL_GMP} @@ -179,8 +179,8 @@ services: args: - CHANGE_SOURCE=${CHANGE_SOURCE} - BASE_IMAGE_TAG_PREFIX=${PHP_FPM_BASE_IMAGE_TAG_PREFIX} - - IVPLDOCK_PHP_VERSION=${PHP_VERSION} - - IVPLDOCK_PHALCON_VERSION=${PHALCON_VERSION} + - DEVDOCK_PHP_VERSION=${PHP_VERSION} + - DEVDOCK_PHALCON_VERSION=${PHALCON_VERSION} - INSTALL_BZ2=${PHP_FPM_INSTALL_BZ2} - INSTALL_ENCHANT=${PHP_FPM_INSTALL_ENCHANT} - INSTALL_GMP=${PHP_FPM_INSTALL_GMP} @@ -291,9 +291,9 @@ services: context: ./.docker/php-worker args: - CHANGE_SOURCE=${CHANGE_SOURCE} - - IVPLDOCK_PHP_VERSION=${PHP_VERSION} + - DEVDOCK_PHP_VERSION=${PHP_VERSION} - PHALCON_VERSION=${PHALCON_VERSION} - - IVPLDOCK_PHALCON_VERSION=${PHALCON_VERSION} + - DEVDOCK_PHALCON_VERSION=${PHALCON_VERSION} - INSTALL_BZ2=${PHP_WORKER_INSTALL_BZ2} - INSTALL_GD=${PHP_WORKER_INSTALL_GD} - INSTALL_IMAGEMAGICK=${PHP_WORKER_INSTALL_IMAGEMAGICK} @@ -429,7 +429,7 @@ services: build: ./.docker/phpmyadmin volumes: - ./.docker/phpmyadmin/config.user.inc.php:/etc/phpmyadmin/config.user.inc.php - - ./resources/databases:/var/www/html/tmp/ivpldock_databases + - ./resources/databases:/var/www/html/tmp/devdock_databases environment: - PMA_ARBITRARY=1 - MYSQL_USER=${PMA_USER} diff --git a/down.sh b/down.sh index 5314fa2..7ed7428 100755 --- a/down.sh +++ b/down.sh @@ -1,2 +1,2 @@ #!/bin/bash -docker-compose --env-file .env.docker down -v +docker compose --env-file .env.docker down -v diff --git a/starmeup.sh b/starmeup.sh index be4f9d5..9417766 100755 --- a/starmeup.sh +++ b/starmeup.sh @@ -1,2 +1,2 @@ #!/bin/bash -docker-compose --env-file .env.docker up beanstalkd beanstalkd-console mariadb nginx php-fpm php-worker phpmyadmin redis workspace +docker compose --env-file .env.docker up beanstalkd beanstalkd-console mariadb nginx php-fpm php-worker phpmyadmin redis workspace diff --git a/startmeup.sh b/startmeup.sh index a61dba4..ebe8486 100755 --- a/startmeup.sh +++ b/startmeup.sh @@ -1,2 +1,2 @@ #!/bin/bash -docker-compose --env-file .env.docker up beanstalkd beanstalkd-console mariadb nginx php-fpm php-worker phpmyadmin redis workspace -d +docker compose --env-file .env.docker up beanstalkd beanstalkd-console mariadb nginx php-fpm php-worker phpmyadmin redis workspace -d diff --git a/workmeup.sh b/workmeup.sh index 5c51c69..616bc3e 100755 --- a/workmeup.sh +++ b/workmeup.sh @@ -1,2 +1,2 @@ #!/bin/bash -docker exec --env-file .env.docker -it --user=ivpldock $(docker ps -aqf "name=workspace") bash +docker exec --env-file .env.docker -it --user=devdock $(docker ps -aqf "name=workspace") bash