Browse Source
- remove php 73 containers
- remove php 73 containers
* remove nodejs install from src builds * fix composer auth secret path linksmaster
15 changed files with 34 additions and 367 deletions
-
58dockerfiles/php-fpm/php73.Dockerfile
-
113dockerfiles/workspace/workspace73.Dockerfile
-
28dockerfiles/workspace/workspace74.Dockerfile
-
19dockerfiles/workspace/workspace81.Dockerfile
-
7src/docker-compose.base.yml
-
22src/docker-compose.yml
-
7src/dockerfiles/php-fpm/php73.Dockerfile
-
5src/dockerfiles/workspace/composer.Dockerfile
-
16src/dockerfiles/workspace/composer1.Dockerfile
-
0src/dockerfiles/workspace/tmux.conf
-
113src/dockerfiles/workspace/workspace.base.Dockerfile
-
9src/dockerfiles/workspace/workspace73.Dockerfile
-
2src/dockerfiles/workspace/workspace74.Dockerfile
-
2src/dockerfiles/workspace/workspace81.Dockerfile
-
0src/dockerfiles/workspace/xdebug2.ini
@ -1,58 +0,0 @@ |
|||
FROM dimti/php:7.3 |
|||
|
|||
########################################################################### |
|||
# Redis and igbinary: |
|||
########################################################################### |
|||
|
|||
ARG INSTALL_REDIS=false |
|||
|
|||
COPY ./igbinary.ini /usr/local/etc/php/conf.d/igbinary.ini |
|||
|
|||
RUN if [ ${INSTALL_REDIS} = true ]; then \ |
|||
pecl install -a igbinary \ |
|||
&& docker-php-ext-enable igbinary \ |
|||
&& printf "yes\n" | pecl install redis \ |
|||
&& docker-php-ext-enable redis \ |
|||
;fi |
|||
|
|||
########################################################################### |
|||
# Pear Mail and Mail_Mime: |
|||
########################################################################### |
|||
|
|||
ARG INSTALL_PEAR_MAIL=false |
|||
|
|||
RUN if [ ${INSTALL_PEAR_MAIL} = true ]; then \ |
|||
pear install Mail && pear install Mail_Mime \ |
|||
;fi |
|||
|
|||
########################################################################### |
|||
# xDebug (termporary): |
|||
########################################################################### |
|||
|
|||
# Copy xdebug configuration for remote debugging |
|||
COPY ./xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini |
|||
|
|||
########################################################################### |
|||
# Permission denied on /tmp folder: |
|||
########################################################################### |
|||
|
|||
RUN chmod 1777 /tmp |
|||
|
|||
########################################################################### |
|||
# Tune opts: |
|||
########################################################################### |
|||
|
|||
ARG PHP_OPT_SHORT_OPEN_TAG=Off |
|||
RUN sed -i "s/^short_open_tag = .*/short_open_tag = $PHP_OPT_SHORT_OPEN_TAG/g" "$PHP_INI_DIR/php.ini" |
|||
|
|||
ARG PHP_OPT_MAX_EXECUTION_TIME=600 |
|||
RUN sed -i "s/^max_execution_time = .*/max_execution_time = $PHP_OPT_MAX_EXECUTION_TIME/g" "$PHP_INI_DIR/php.ini" |
|||
|
|||
ARG PHP_OPT_MEMORY_LIMIT=256M |
|||
RUN sed -i "s/^memory_limit = .*/memory_limit = $PHP_OPT_MEMORY_LIMIT/g" "$PHP_INI_DIR/php.ini" |
|||
|
|||
ARG PHP_OPT_POST_MAX_SIZE=48M |
|||
RUN sed -i "s/^post_max_size = .*/post_max_size = $PHP_OPT_POST_MAX_SIZE/g" "$PHP_INI_DIR/php.ini" |
|||
|
|||
ARG PHP_OPT_UPLOAD_MAX_FILESIZE=16M |
|||
RUN sed -i "s/^upload_max_filesize = .*/upload_max_filesize = $PHP_OPT_UPLOAD_MAX_FILESIZE/g" "$PHP_INI_DIR/php.ini" |
|||
@ -1,113 +0,0 @@ |
|||
FROM dimti/workspace:7.3 |
|||
|
|||
ARG PHP_VERSION=7.3 |
|||
|
|||
########################################################################### |
|||
# Laradock non-root user: |
|||
########################################################################### |
|||
|
|||
ARG CUSTOM_PUID=1000 |
|||
ENV PUID ${CUSTOM_PUID} |
|||
ARG CUSTOM_PGID=1000 |
|||
ENV PGID ${CUSTOM_PGID} |
|||
|
|||
RUN usermod -u ${CUSTOM_PUID} laradock && groupmod -g ${CUSTOM_PGID} laradock |
|||
|
|||
RUN chown -R ${CUSTOM_PUID}:${CUSTOM_PGID} /home/laradock |
|||
|
|||
########################################################################### |
|||
# Set Timezone |
|||
########################################################################### |
|||
|
|||
ARG CUSTOM_TZ=Europe/Moscow |
|||
ENV TZ ${CUSTOM_TZ} |
|||
|
|||
RUN ln -snf /usr/share/zoneinfo/$CUSTOM_TZ /etc/localtime && echo $CUSTOM_TZ > /etc/timezone |
|||
|
|||
########################################################################### |
|||
# Additional PHP-extensions: |
|||
########################################################################### |
|||
|
|||
#RUN pecl install igbinary && pecl install -a redis |
|||
RUN pecl install -a redis |
|||
|
|||
RUN echo "extension=redis.so" > /etc/php/${PHP_VERSION}/cli/conf.d/20-redis.ini |
|||
|
|||
########################################################################### |
|||
# Update composer version |
|||
########################################################################### |
|||
|
|||
USER root |
|||
|
|||
ARG COMPOSER_VERSION=2 |
|||
ENV COMPOSER_VERSION ${COMPOSER_VERSION} |
|||
RUN composer self-update --${COMPOSER_VERSION} |
|||
|
|||
########################################################################### |
|||
# Install custom node version |
|||
########################################################################### |
|||
|
|||
USER root |
|||
|
|||
ARG CUSTOM_NODE_VERSION |
|||
ENV CUSTOM_NODE_VERSION ${CUSTOM_NODE_VERSION} |
|||
|
|||
RUN if [ ! -z "${CUSTOM_NODE_VERSION}" ]; then \ |
|||
. ~/.bashrc && nvm install ${CUSTOM_NODE_VERSION} \ |
|||
&& . ~/.bashrc && nvm alias default ${CUSTOM_NODE_VERSION} \ |
|||
&& cp -R ~/.nvm/alias /home/laradock/.nvm \ |
|||
&& cp -R ~/.nvm/versions /home/laradock/.nvm \ |
|||
&& chown -R ${CUSTOM_PUID}:${CUSTOM_PGID} /home/laradock/.nvm \ |
|||
;fi |
|||
|
|||
########################################################################### |
|||
# Remove DST_Root_CA3 |
|||
########################################################################### |
|||
|
|||
RUN sed -i 's/^mozilla\/DST_Root_CA_X3\.crt/!mozilla\/DST_Root_CA_X3.crt/g' /etc/ca-certificates.conf && update-ca-certificates |
|||
|
|||
########################################################################### |
|||
# Laradock Aliases |
|||
########################################################################### |
|||
|
|||
USER laradock |
|||
|
|||
COPY ./aliases.sh /home/laradock/aliases.sh |
|||
|
|||
RUN echo "" >> ~/.bashrc && \ |
|||
echo "# Load Custom Aliases" >> ~/.bashrc && \ |
|||
echo "source ~/aliases.sh" >> ~/.bashrc && \ |
|||
echo "" >> ~/.bashrc |
|||
|
|||
########################################################################### |
|||
# S3 config |
|||
########################################################################### |
|||
|
|||
USER laradock |
|||
|
|||
COPY ./minio/auth.json /home/laradock/.mc/config.json |
|||
|
|||
########################################################################### |
|||
# Tune opts: |
|||
########################################################################### |
|||
|
|||
USER root |
|||
|
|||
ARG PHP_OPT_SHORT_OPEN_TAG=Off |
|||
RUN sed -i "s/^short_open_tag = .*/short_open_tag = $PHP_OPT_SHORT_OPEN_TAG/g" /etc/php/${PHP_VERSION}/cli/php.ini |
|||
|
|||
ARG PHP_OPT_MAX_EXECUTION_TIME=600 |
|||
RUN sed -i "s/^max_execution_time = .*/max_execution_time = $PHP_OPT_MAX_EXECUTION_TIME/g" /etc/php/${PHP_VERSION}/cli/php.ini |
|||
|
|||
ARG PHP_OPT_MEMORY_LIMIT=256M |
|||
RUN sed -i "s/^memory_limit = .*/memory_limit = $PHP_OPT_MEMORY_LIMIT/g" /etc/php/${PHP_VERSION}/cli/php.ini |
|||
|
|||
########################################################################### |
|||
# Crontab |
|||
########################################################################### |
|||
|
|||
USER root |
|||
|
|||
COPY ./crontab /etc/cron.d |
|||
|
|||
RUN chmod -R 644 /etc/cron.d |
|||
@ -1,7 +0,0 @@ |
|||
# syntax = edrevo/dockerfile-plus |
|||
FROM php:7.3-fpm |
|||
|
|||
INCLUDE+ ./php.base.Dockerfile |
|||
|
|||
RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ |
|||
&& docker-php-ext-install -j$(nproc) gd |
|||
@ -1,16 +0,0 @@ |
|||
########################################################################### |
|||
# Composer: |
|||
########################################################################### |
|||
|
|||
USER laradock |
|||
|
|||
# Create composer dir for store composer2_auth secret |
|||
RUN mkdir -p /home/laradock/.composer |
|||
|
|||
USER root |
|||
|
|||
# Symlink to composer auth secret |
|||
RUN ln -s /run/secrets/composer1_auth /home/laradock/.composer/auth.json |
|||
|
|||
# Chooce composer version |
|||
RUN composer self-update --1 |
|||
@ -1,9 +0,0 @@ |
|||
# syntax = edrevo/dockerfile-plus |
|||
FROM laradock/workspace:latest-7.3 |
|||
|
|||
ARG PHP_VERSION=7.3 |
|||
ENV PHP_VERSION ${PHP_VERSION} |
|||
|
|||
INCLUDE+ ./workspace.base.Dockerfile |
|||
INCLUDE+ ./composer1.Dockerfile |
|||
INCLUDE+ ./xdebug2.Dockerfile |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue