diff --git a/readme.md b/readme.md index 2ca5847..d639fbf 100644 --- a/readme.md +++ b/readme.md @@ -6,12 +6,12 @@ Images can be found on [docker hub](https://hub.docker.com/repository/docker/dan #### Supported versions -* php 7.4.12 +* php 7.4.13 * composer 1.10.17 * xdebug 2.9.8 * rdkafka 3.1.2 * timecop 1.2.10 -* php 7.3.24 +* php 7.3.25 * composer 1.10.17 * xdebug 2.9.8 * rdkafka 3.1.2 @@ -22,6 +22,8 @@ Images can be found on [docker hub](https://hub.docker.com/repository/docker/dan * rdkafka 3.1.2 * timecop 1.2.10 +All images now include [zsh](https://www.zsh.org/), that allowed using [oh-my-zsh](https://github.com/ohmyzsh/ohmyzsh) and its plugins for improving user experience. + #### Build To build container just use one of this commands: @@ -40,3 +42,21 @@ docker run -it --rm -v `pwd`:/var/www/project -w /var/www/project --user=1000 lo ``` where replace `*` minor php version. + +##### Using oh-my-zsh from local machine + +To use already installed `oh-my-zsh` inside docker container we should pass couple volumes and environment variables: +* `-v .zshrc:/home/user/.zshrc` - configuration file for `zsh` +* `-v .oh-my-zsh:/home/user/oh-my-zsh` - directory with installed `oh-my-zsh` +* `-e HOME=/home/user` - define user home directory + +Full run command would be looks like +```bash +docker run -it --rm \ + -v `pwd`:/var/www/project \ + -v .zshrc:/home/user/.zshrc \ + -v .oh-my-zsh:/home/user/oh-my-zsh \ + -e HOME=/home/user \ + -w /var/www/project \ + --user=1000 local-composer:7.* sh +``` diff --git a/v7.2/Dockerfile b/v7.2/Dockerfile index 5c4dffe..69c7f83 100644 --- a/v7.2/Dockerfile +++ b/v7.2/Dockerfile @@ -2,7 +2,7 @@ FROM php:7.2.34-alpine RUN apk update && apk add --no-cache $PHPIZE_DEPS \ && apk add --no-cache zlib-dev gd-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev \ - curl gmp-dev librdkafka-dev imap-dev openssl-dev git + curl gmp-dev librdkafka-dev imap-dev openssl-dev git zsh RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \ --with-png-dir=/usr/include/ \ diff --git a/v7.3/Dockerfile b/v7.3/Dockerfile index c703121..891b871 100644 --- a/v7.3/Dockerfile +++ b/v7.3/Dockerfile @@ -1,8 +1,8 @@ -FROM php:7.3.24-alpine +FROM php:7.3.25-alpine RUN apk update && apk add --no-cache $PHPIZE_DEPS \ && apk add --no-cache zlib-dev gd-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev \ - curl zip libzip-dev gmp-dev librdkafka-dev imap-dev openssl-dev git + curl zip libzip-dev gmp-dev librdkafka-dev imap-dev openssl-dev git zsh RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \ --with-png-dir=/usr/include/ \ diff --git a/v7.4/Dockerfile b/v7.4/Dockerfile index 3f3b768..81d6c70 100644 --- a/v7.4/Dockerfile +++ b/v7.4/Dockerfile @@ -1,8 +1,8 @@ -FROM php:7.4.12-alpine +FROM php:7.4.13-alpine RUN apk update && apk add --no-cache $PHPIZE_DEPS \ && apk add --no-cache zlib-dev gd-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev \ - curl zip libzip-dev gmp-dev librdkafka-dev imap-dev openssl-dev git + curl zip libzip-dev gmp-dev librdkafka-dev imap-dev openssl-dev git zsh RUN docker-php-ext-configure gd --enable-gd \ --with-freetype \ --with-jpeg \