Skip to content
Snippets Groups Projects
Commit 2def5579 authored by Roger Feese's avatar Roger Feese
Browse files

Merge branch 'develop' into 'master'

Add new museum server

See merge request !102
parents 7c23da3b de77976e
No related branches found
No related tags found
1 merge request!102Add new museum server
......@@ -36,4 +36,5 @@ RUN mkdir -p ~/.ssh && chmod 700 ~/.ssh \
its-lampinteg2.unl.edu,144.216.202.38 \
its-lampstage2.unl.edu,144.216.202.43 \
its-lampprod2.unl.edu,144.216.202.44 \
its-ads-museum-reservations1.unl.edu,144.216.202.10 \
>> ~/.ssh/known_hosts
......@@ -14,7 +14,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
RUN apk add --no-cache bash nodejs nodejs-npm $PHPIZE_DEPS \
&& pecl channel-update pecl.php.net \
&& pecl install xdebug-3.1.6 redis \
&& pecl install xdebug-3.1.6 redis-6.0.2 \
&& docker-php-ext-enable xdebug redis \
&& apk del --no-cache $PHPIZE_DEPS
RUN curl -o /usr/local/bin/composer https://getcomposer.org/composer.phar \
......
......@@ -15,7 +15,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
RUN export BUILD_DEPS="bzip2-dev icu-dev libpng-dev libzip-dev openldap-dev" \
&& apk add --no-cache bash nodejs npm $PHPIZE_DEPS $BUILD_DEPS \
&& pecl channel-update pecl.php.net \
&& pecl install xdebug-3.1.6 redis \
&& pecl install xdebug-3.1.6 redis-6.0.2 \
&& docker-php-ext-install bz2 gd intl ldap mysqli pdo_mysql zip \
&& docker-php-ext-enable xdebug redis \
&& apk del --no-cache $PHPIZE_DEPS
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment