more stuff

This commit is contained in:
Homer 2018-10-11 17:21:11 +01:00
parent b8fc958111
commit c3e008be30
4 changed files with 21 additions and 5 deletions

View File

@ -16,10 +16,12 @@ RUN \
echo "**** install build packages ****" && \
apk add --no-cache \
curl \
memcached \
php7-ctype \
php7-dom \
php7-gd \
php7-mbstring \
php7-memcached \
php7-mysqlnd \
php7-openssl \
php7-pdo_mysql \

View File

@ -16,10 +16,12 @@ RUN \
echo "**** install build packages ****" && \
apk add --no-cache \
curl \
memcached \
php7-ctype \
php7-dom \
php7-gd \
php7-mbstring \
php7-memcached \
php7-mysqlnd \
php7-openssl \
php7-pdo_mysql \

4
Jenkinsfile vendored
View File

@ -17,11 +17,13 @@ pipeline {
BUILDS_DISCORD = credentials('build_webhook_url')
GITHUB_TOKEN = credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
DIST_IMAGE = 'alpine'
DIST_TAG = '3.7'
DIST_TAG = '3.8'
DIST_PACKAGES = 'curl \
memcached \
php7-openssl \
php7-pdo_mysql \
php7-mbstring \
php7-memcached \
php7-tidy \
php7-phar \
php7-dom \

View File

@ -47,11 +47,21 @@ if [ ! -z "$APP_URL" -a -z "$ADVANCED_MODE" ];
sed -i "s,#\sAPP_URL.*,APP_URL=${APP_URL},g" /var/www/html/.env
fi
# email=1 set? let's do some more work
if [ ! -z "$USE_EMAIL" ];
# set up the application to use memcached
sed -i "s/CACHE_DRIVER=file/CACHE_DRIVER=memcached/g"
sed -i "s/SESSION_DRIVER=file/SESSION_DRIVER=memcached/g"
# email username set? let's do some more work
if [ "$MAIL_USERNAME" -a -z "$ADVANCED_MODE" ];
then
echo "Setting up email vars"
sed i "s\"
echo "Setting up email vars. Check BookStack docs"
sed -i "s/MAIL_PORT=1025/MAIL_PORT=${MAIL_PORT}/g"
sed -i "s/MAIL_USERNAME=null/MAIL_USERNAME=${MAIL_USERNAME}/g"
sed -i "s/MAIL_PASSWORD=null/MAIL_PASSWORD=${MAIL_PASSWORD}/g"
sed -i "s/MAIL_ENCRYPTION=null/MAIL_ENCRYPTION=${MAIL_ENCRYPTION}/g"
sed -i "s/MAIL_FROM=null/MAIL_FROM=${MAIL_FROM}/g"
sed -i "s/MAIL_FROM_NAME=null/MAIL_FROM_NAME=${MAIL_FROM_NAME}/g"
fi
# Create API key if needed
if [ ! -f "/config/BOOKSTACK_APP_KEY.txt" ]