Skip to content

Commit

Permalink
Merge pull request #111 from devilbox/release-0.84
Browse files Browse the repository at this point in the history
Release 0.84
  • Loading branch information
cytopia authored Apr 20, 2019
2 parents 2ab9995 + 4b21c70 commit bcbc8e2
Show file tree
Hide file tree
Showing 16 changed files with 92 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Dockerfiles/mods/Dockerfile-5.3
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ RUN set -x \
&& (rm -rf /usr/local/lib/php/doc/redis || true) \
\
# ---- Installing PHP Extension: rdkafka ----
&& pecl install rdkafka \
&& pecl install rdkafka-3.0.5 \
&& docker-php-ext-enable rdkafka \
&& (rm -rf /usr/local/lib/php/test/rdkafka || true) \
&& (rm -rf /usr/local/lib/php/doc/rdkafka || true) \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/mods/Dockerfile-5.4
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ RUN set -x \
&& (rm -rf /usr/local/lib/php/doc/redis || true) \
\
# ---- Installing PHP Extension: rdkafka ----
&& pecl install rdkafka \
&& pecl install rdkafka-3.0.5 \
&& docker-php-ext-enable rdkafka \
&& (rm -rf /usr/local/lib/php/test/rdkafka || true) \
&& (rm -rf /usr/local/lib/php/doc/rdkafka || true) \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/mods/Dockerfile-5.5
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ RUN set -x \
&& (rm -rf /usr/local/lib/php/doc/redis || true) \
\
# ---- Installing PHP Extension: rdkafka ----
&& pecl install rdkafka \
&& pecl install rdkafka-3.0.5 \
&& docker-php-ext-enable rdkafka \
&& (rm -rf /usr/local/lib/php/test/rdkafka || true) \
&& (rm -rf /usr/local/lib/php/doc/rdkafka || true) \
Expand Down
3 changes: 3 additions & 0 deletions Dockerfiles/work/Dockerfile-5.2
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,8 @@ RUN set -x \
### Install Node npm packages (globally)
###
RUN set -x \
# angular_cli
&& su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \
# eslint
&& su -c '. /opt/nvm/nvm.sh; npm install -g eslint' devilbox \
# grunt
Expand Down Expand Up @@ -397,6 +399,7 @@ RUN set -x \
&& ansible --version | grep -E '^ansible [.0-9]+$' \
&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
\
&& ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \
&& eslint -v | grep -E '[.0-9]+' \
&& grunt --version | grep -E '[.0-9]+' \
&& gulp --version | grep -E '[.0-9]+' \
Expand Down
3 changes: 3 additions & 0 deletions Dockerfiles/work/Dockerfile-5.3
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,8 @@ RUN set -x \
### Install Node npm packages (globally)
###
RUN set -x \
# angular_cli
&& su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \
# eslint
&& su -c '. /opt/nvm/nvm.sh; npm install -g eslint' devilbox \
# grunt
Expand Down Expand Up @@ -445,6 +447,7 @@ RUN set -x \
&& ansible --version | grep -E '^ansible [.0-9]+$' \
&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
\
&& ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \
&& eslint -v | grep -E '[.0-9]+' \
&& grunt --version | grep -E '[.0-9]+' \
&& gulp --version | grep -E '[.0-9]+' \
Expand Down
3 changes: 3 additions & 0 deletions Dockerfiles/work/Dockerfile-5.4
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,8 @@ RUN set -x \
### Install Node npm packages (globally)
###
RUN set -x \
# angular_cli
&& su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \
# eslint
&& su -c '. /opt/nvm/nvm.sh; npm install -g eslint' devilbox \
# grunt
Expand Down Expand Up @@ -478,6 +480,7 @@ RUN set -x \
&& ansible --version | grep -E '^ansible [.0-9]+$' \
&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
\
&& ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \
&& eslint -v | grep -E '[.0-9]+' \
&& grunt --version | grep -E '[.0-9]+' \
&& gulp --version | grep -E '[.0-9]+' \
Expand Down
8 changes: 8 additions & 0 deletions Dockerfiles/work/Dockerfile-5.5
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,10 @@ RUN set -x \
'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \
&& su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \
\
# lumen
&& COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \
&& ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/lumen \
\
# mhsendmail
&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
&& chmod +x mhsendmail_linux_amd64 \
Expand Down Expand Up @@ -341,6 +345,8 @@ RUN set -x \
### Install Node npm packages (globally)
###
RUN set -x \
# angular_cli
&& su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \
# eslint
&& su -c '. /opt/nvm/nvm.sh; npm install -g eslint' devilbox \
# grunt
Expand Down Expand Up @@ -478,6 +484,7 @@ RUN set -x \
&& laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \
&& linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \
&& su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \
&& lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \
&& mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \
&& phalcon commands | grep -E '[.0-9]+' \
&& phpcs --version | grep -E 'version [.0-9]+' \
Expand All @@ -492,6 +499,7 @@ RUN set -x \
&& ansible --version | grep -E '^ansible [.0-9]+$' \
&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
\
&& ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \
&& eslint -v | grep -E '[.0-9]+' \
&& grunt --version | grep -E '[.0-9]+' \
&& gulp --version | grep -E '[.0-9]+' \
Expand Down
8 changes: 8 additions & 0 deletions Dockerfiles/work/Dockerfile-5.6
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,10 @@ RUN set -x \
'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \
&& su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \
\
# lumen
&& COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \
&& ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/lumen \
\
# mhsendmail
&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
&& chmod +x mhsendmail_linux_amd64 \
Expand Down Expand Up @@ -353,6 +357,8 @@ RUN set -x \
### Install Node npm packages (globally)
###
RUN set -x \
# angular_cli
&& su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \
# eslint
&& su -c '. /opt/nvm/nvm.sh; npm install -g eslint' devilbox \
# grunt
Expand Down Expand Up @@ -491,6 +497,7 @@ RUN set -x \
&& laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \
&& linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \
&& su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \
&& lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \
&& mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \
&& phalcon commands | grep -E '[.0-9]+' \
&& phpcs --version | grep -E 'version [.0-9]+' \
Expand All @@ -505,6 +512,7 @@ RUN set -x \
&& ansible --version | grep -E '^ansible [.0-9]+$' \
&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
\
&& ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \
&& eslint -v | grep -E '[.0-9]+' \
&& grunt --version | grep -E '[.0-9]+' \
&& gulp --version | grep -E '[.0-9]+' \
Expand Down
8 changes: 8 additions & 0 deletions Dockerfiles/work/Dockerfile-7.0
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,10 @@ RUN set -x \
'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \
&& su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \
\
# lumen
&& COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \
&& ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/lumen \
\
# mhsendmail
&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
&& chmod +x mhsendmail_linux_amd64 \
Expand Down Expand Up @@ -353,6 +357,8 @@ RUN set -x \
### Install Node npm packages (globally)
###
RUN set -x \
# angular_cli
&& su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \
# eslint
&& su -c '. /opt/nvm/nvm.sh; npm install -g eslint' devilbox \
# grunt
Expand Down Expand Up @@ -491,6 +497,7 @@ RUN set -x \
&& laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \
&& linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \
&& su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \
&& lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \
&& mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \
&& phalcon commands | grep -E '[.0-9]+' \
&& phpcs --version | grep -E 'version [.0-9]+' \
Expand All @@ -505,6 +512,7 @@ RUN set -x \
&& ansible --version | grep -E '^ansible [.0-9]+$' \
&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
\
&& ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \
&& eslint -v | grep -E '[.0-9]+' \
&& grunt --version | grep -E '[.0-9]+' \
&& gulp --version | grep -E '[.0-9]+' \
Expand Down
8 changes: 8 additions & 0 deletions Dockerfiles/work/Dockerfile-7.1
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,10 @@ RUN set -x \
'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \
&& su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \
\
# lumen
&& COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \
&& ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/lumen \
\
# mhsendmail
&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
&& chmod +x mhsendmail_linux_amd64 \
Expand Down Expand Up @@ -353,6 +357,8 @@ RUN set -x \
### Install Node npm packages (globally)
###
RUN set -x \
# angular_cli
&& su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \
# eslint
&& su -c '. /opt/nvm/nvm.sh; npm install -g eslint' devilbox \
# grunt
Expand Down Expand Up @@ -491,6 +497,7 @@ RUN set -x \
&& laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \
&& linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \
&& su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \
&& lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \
&& mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \
&& phalcon commands | grep -E '[.0-9]+' \
&& phpcs --version | grep -E 'version [.0-9]+' \
Expand All @@ -505,6 +512,7 @@ RUN set -x \
&& ansible --version | grep -E '^ansible [.0-9]+$' \
&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
\
&& ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \
&& eslint -v | grep -E '[.0-9]+' \
&& grunt --version | grep -E '[.0-9]+' \
&& gulp --version | grep -E '[.0-9]+' \
Expand Down
8 changes: 8 additions & 0 deletions Dockerfiles/work/Dockerfile-7.2
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,10 @@ RUN set -x \
'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \
&& su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \
\
# lumen
&& COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \
&& ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/lumen \
\
# mhsendmail
&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
&& chmod +x mhsendmail_linux_amd64 \
Expand Down Expand Up @@ -353,6 +357,8 @@ RUN set -x \
### Install Node npm packages (globally)
###
RUN set -x \
# angular_cli
&& su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \
# eslint
&& su -c '. /opt/nvm/nvm.sh; npm install -g eslint' devilbox \
# grunt
Expand Down Expand Up @@ -491,6 +497,7 @@ RUN set -x \
&& laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \
&& linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \
&& su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \
&& lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \
&& mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \
&& phalcon commands | grep -E '[.0-9]+' \
&& phpcs --version | grep -E 'version [.0-9]+' \
Expand All @@ -505,6 +512,7 @@ RUN set -x \
&& ansible --version | grep -E '^ansible [.0-9]+$' \
&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
\
&& ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \
&& eslint -v | grep -E '[.0-9]+' \
&& grunt --version | grep -E '[.0-9]+' \
&& gulp --version | grep -E '[.0-9]+' \
Expand Down
8 changes: 8 additions & 0 deletions Dockerfiles/work/Dockerfile-7.3
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,10 @@ RUN set -x \
'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \
&& su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \
\
# lumen
&& COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \
&& ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/lumen \
\
# mhsendmail
&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
&& chmod +x mhsendmail_linux_amd64 \
Expand Down Expand Up @@ -342,6 +346,8 @@ RUN set -x \
### Install Node npm packages (globally)
###
RUN set -x \
# angular_cli
&& su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \
# eslint
&& su -c '. /opt/nvm/nvm.sh; npm install -g eslint' devilbox \
# grunt
Expand Down Expand Up @@ -480,6 +486,7 @@ RUN set -x \
&& laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \
&& linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \
&& su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \
&& lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \
&& mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \
&& phpcs --version | grep -E 'version [.0-9]+' \
&& phpcbf --version | grep -E 'version [.0-9]+' \
Expand All @@ -493,6 +500,7 @@ RUN set -x \
&& ansible --version | grep -E '^ansible [.0-9]+$' \
&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
\
&& ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \
&& eslint -v | grep -E '[.0-9]+' \
&& grunt --version | grep -E '[.0-9]+' \
&& gulp --version | grep -E '[.0-9]+' \
Expand Down
8 changes: 8 additions & 0 deletions Dockerfiles/work/Dockerfile-7.4
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,10 @@ RUN set -x \
'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \
&& su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \
\
# lumen
&& COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \
&& ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/lumen \
\
# mhsendmail
&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
&& chmod +x mhsendmail_linux_amd64 \
Expand Down Expand Up @@ -338,6 +342,8 @@ RUN set -x \
### Install Node npm packages (globally)
###
RUN set -x \
# angular_cli
&& su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \
# eslint
&& su -c '. /opt/nvm/nvm.sh; npm install -g eslint' devilbox \
# grunt
Expand Down Expand Up @@ -476,6 +482,7 @@ RUN set -x \
&& laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \
&& linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \
&& su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \
&& lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \
&& mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \
&& phpcs --version | grep -E 'version [.0-9]+' \
&& phpcbf --version | grep -E 'version [.0-9]+' \
Expand All @@ -488,6 +495,7 @@ RUN set -x \
&& ansible --version | grep -E '^ansible [.0-9]+$' \
&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
\
&& ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \
&& eslint -v | grep -E '[.0-9]+' \
&& grunt --version | grep -E '[.0-9]+' \
&& gulp --version | grep -E '[.0-9]+' \
Expand Down
3 changes: 3 additions & 0 deletions Dockerfiles/work/Dockerfile-8.0
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,8 @@ RUN set -x \
### Install Node npm packages (globally)
###
RUN set -x \
# angular_cli
&& su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \
# eslint
&& su -c '. /opt/nvm/nvm.sh; npm install -g eslint' devilbox \
# grunt
Expand Down Expand Up @@ -415,6 +417,7 @@ RUN set -x \
&& ansible --version | grep -E '^ansible [.0-9]+$' \
&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
\
&& ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \
&& eslint -v | grep -E '[.0-9]+' \
&& grunt --version | grep -E '[.0-9]+' \
&& gulp --version | grep -E '[.0-9]+' \
Expand Down
9 changes: 9 additions & 0 deletions build/ansible/group_vars/all/mods.yml
Original file line number Diff line number Diff line change
Expand Up @@ -764,6 +764,15 @@ extensions_available:
already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0]
rdkafka:
disabled: [5.2, 8.0]
5.3:
type: pecl
version: 3.0.5
5.4:
type: pecl
version: 3.0.5
5.5:
type: pecl
version: 3.0.5
all:
type: pecl
build_dep: [librdkafka-dev]
Expand Down
Loading

0 comments on commit bcbc8e2

Please sign in to comment.