Skip to content

Dayne PC DevDock updates #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
nielsdrost7 wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Dayne PC DevDock updates #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .docker/laravel-horizon/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <mahmoud@zalt.me>"

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.

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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; \
Expand Down
50 changes: 25 additions & 25 deletions .docker/php-fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <mahmoud@zalt.me>"

ARG IVPLDOCK_PHP_VERSION
ARG DEVDOCK_PHP_VERSION

# Set Environment Variables
ENV DEBIAN_FRONTEND noninteractive
Expand Down Expand Up @@ -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; \
Expand Down Expand Up @@ -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

###########################################################################
Expand Down Expand Up @@ -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; \
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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$' \
Expand Down Expand Up @@ -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 - \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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; \
Expand Down Expand Up @@ -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}."

#
#--------------------------------------------------------------------------
Expand Down
20 changes: 10 additions & 10 deletions .docker/php-worker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <mahmoud@zalt.me>"

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.

Expand Down Expand Up @@ -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; \
Expand Down Expand Up @@ -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; \
Expand Down Expand Up @@ -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; \
Expand Down
2 changes: 1 addition & 1 deletion .docker/phpmyadmin/config.user.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'] = '';

/**
Expand Down
Loading