Skip to content
Snippets Groups Projects
Commit 48df7ff0 authored by Raul Barreras's avatar Raul Barreras
Browse files

Sync 7-add-dependency-check with develop

[skip ci]
parent 4462ec78
No related branches found
No related tags found
1 merge request!17Resolve "Add Dependency Check"
...@@ -51,8 +51,8 @@ for dir in "${LINT_DIRS[@]}"; do ...@@ -51,8 +51,8 @@ for dir in "${LINT_DIRS[@]}"; do
echo "Scanning directory ${dir} for extension ${ext}" echo "Scanning directory ${dir} for extension ${ext}"
# Scan current dir and ext and lint them # Scan current dir and ext and lint them
for f in $(find "${dir}" -type f -name "*${ext}"); do find "${dir}" -type f -name "*${ext}" -print0 | while IFS= read -r -d '' f; do
OUTPUT=$(php -l $f 2>&1) OUTPUT=$(php -l "$f" 2>&1)
rc=$? rc=$?
if [[ $rc != 0 ]]; then # Non-zero exit code, print error and exit if [[ $rc != 0 ]]; then # Non-zero exit code, print error and exit
......
...@@ -12,9 +12,10 @@ LABEL org.label-schema.build-date=$BUILD_DATE \ ...@@ -12,9 +12,10 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.schema-version="1.0" \ org.label-schema.schema-version="1.0" \
maintainer="Alan Nelson <alan.nelson@nebraska.edu>" maintainer="Alan Nelson <alan.nelson@nebraska.edu>"
RUN apk add --no-cache bash nodejs nodejs-npm $PHPIZE_DEPS \ RUN apk add --no-cache bash nodejs nodejs-npm libmcrypt-dev $PHPIZE_DEPS \
&& pecl install xdebug \ && pecl install xdebug redis \
&& docker-php-ext-enable xdebug \ && docker-php-ext-enable xdebug redis \
&& docker-php-ext-install mcrypt \
&& apk del --no-cache $PHPIZE_DEPS && apk del --no-cache $PHPIZE_DEPS
RUN curl -o /usr/local/bin/composer https://getcomposer.org/composer.phar \ RUN curl -o /usr/local/bin/composer https://getcomposer.org/composer.phar \
&& chmod 755 /usr/local/bin/composer && chmod 755 /usr/local/bin/composer
......
...@@ -13,8 +13,8 @@ LABEL org.label-schema.build-date=$BUILD_DATE \ ...@@ -13,8 +13,8 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
maintainer="Alan Nelson <alan.nelson@nebraska.edu>" maintainer="Alan Nelson <alan.nelson@nebraska.edu>"
RUN apk add --no-cache bash nodejs nodejs-npm $PHPIZE_DEPS \ RUN apk add --no-cache bash nodejs nodejs-npm $PHPIZE_DEPS \
&& pecl install xdebug \ && pecl install xdebug redis \
&& docker-php-ext-enable xdebug \ && docker-php-ext-enable xdebug redis \
&& apk del --no-cache $PHPIZE_DEPS && apk del --no-cache $PHPIZE_DEPS
RUN curl -o /usr/local/bin/composer https://getcomposer.org/composer.phar \ RUN curl -o /usr/local/bin/composer https://getcomposer.org/composer.phar \
&& chmod 755 /usr/local/bin/composer && chmod 755 /usr/local/bin/composer
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment