Skip to content

Commit

Permalink
Merge pull request #3 from linuxserver/dockerfile-updates
Browse files Browse the repository at this point in the history 
fixed broken echo lines and now using thelamer github release logic
  • Loading branch information
@CHBMB
CHBMB authored Jul 13, 2018
2 parents f97a6ea + a98a300 commit 48047ab
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 24 deletions.
15 changes: 10 additions & 5 deletions Dockerfile.aarch64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ COPY qemu-aarch64-static /usr/bin
# set version label
ARG BUILD_DATE
ARG VERSION
ARG BOOKSTACK_RELEASE
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="homerr"

Expand All @@ -26,6 +27,7 @@ apk add --no-cache \
php7-mysqlnd \
php7-tidy \
php7-simplexml \
php7-ctype \
tar && \

echo "**** configure php-fpm to pass env vars ****" && \
Expand All @@ -36,14 +38,17 @@ echo "**** configure php-fpm to pass env vars ****" && \

echo "**** get bookstack ****" && \

BSAPP_VER="$(curl -sX GET https://api.github.com/repos/BookStackApp/BookStack/releases/latest | grep 'tag_name' | cut -d\" -f4)" && \

mkdir -p\
/var/www/html && \

if [ -z ${BOOKSTACK_RELEASE+x} ]; then \
BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \

curl -o \
/tmp/bookstack.tar.gz -L \
"https://github.com/BookStackApp/BookStack/archive/${BSAPP_VER}.tar.gz" && \
/tmp/bookstack.tar.gz -L \
"https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \

tar xf \
/tmp/bookstack.tar.gz -C \
Expand All @@ -57,7 +62,7 @@ cd /tmp && \
curl -sS https://getcomposer.org/installer | php && \
mv /tmp/composer.phar /usr/local/bin/composer && \

echo "**** run composer install ****"
echo "**** run composer install ****" && \

composer install -d /var/www/html/ && \

Expand Down
17 changes: 10 additions & 7 deletions Dockerfile.amd64
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# using ideas/code from other sparklyballs templates
# set variable to get archive based on github api data (sparklyballs heimdall inspiration)

# using ideas/code from other thelamer & sparklyballs lsio templates
FROM lsiobase/alpine.nginx:3.7

# set version label
ARG BUILD_DATE
ARG VERSION
ARG BOOKSTACK_RELEASE
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="homerr"

Expand All @@ -25,6 +24,7 @@ apk add --no-cache \
php7-mysqlnd \
php7-tidy \
php7-simplexml \
php7-ctype \
tar && \

echo "**** configure php-fpm to pass env vars ****" && \
Expand All @@ -35,14 +35,17 @@ echo "**** configure php-fpm to pass env vars ****" && \

echo "**** get bookstack ****" && \

BSAPP_VER="$(curl -sX GET https://api.github.com/repos/BookStackApp/BookStack/releases/latest | grep 'tag_name' | cut -d\" -f4)" && \

mkdir -p\
/var/www/html && \

if [ -z ${BOOKSTACK_RELEASE+x} ]; then \
BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \

curl -o \
/tmp/bookstack.tar.gz -L \
"https://github.com/BookStackApp/BookStack/archive/${BSAPP_VER}.tar.gz" && \
"https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \

tar xf \
/tmp/bookstack.tar.gz -C \
Expand All @@ -56,7 +59,7 @@ cd /tmp && \
curl -sS https://getcomposer.org/installer | php && \
mv /tmp/composer.phar /usr/local/bin/composer && \

echo "**** run composer install ****"
echo "**** run composer install ****" && \

composer install -d /var/www/html/ && \

Expand Down
15 changes: 10 additions & 5 deletions Dockerfile.armhf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ COPY qemu-arm-static /usr/bin
# set version label
ARG BUILD_DATE
ARG VERSION
ARG BOOKSTACK_RELEASE
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="homerr"

Expand All @@ -26,6 +27,7 @@ apk add --no-cache \
php7-mysqlnd \
php7-tidy \
php7-simplexml \
php7-ctype \
tar && \

echo "**** configure php-fpm to pass env vars ****" && \
Expand All @@ -36,14 +38,17 @@ echo "**** configure php-fpm to pass env vars ****" && \

echo "**** get bookstack ****" && \

BSAPP_VER="$(curl -sX GET https://api.github.com/repos/BookStackApp/BookStack/releases/latest | grep 'tag_name' | cut -d\" -f4)" && \

mkdir -p\
/var/www/html && \

if [ -z ${BOOKSTACK_RELEASE+x} ]; then \
BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \

curl -o \
/tmp/bookstack.tar.gz -L \
"https://github.com/BookStackApp/BookStack/archive/${BSAPP_VER}.tar.gz" && \
/tmp/bookstack.tar.gz -L \
"https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \

tar xf \
/tmp/bookstack.tar.gz -C \
Expand All @@ -57,7 +62,7 @@ cd /tmp && \
curl -sS https://getcomposer.org/installer | php && \
mv /tmp/composer.phar /usr/local/bin/composer && \

echo "**** run composer install ****"
echo "**** run composer install ****" && \

composer install -d /var/www/html/ && \

Expand Down
12 changes: 6 additions & 6 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -495,8 +495,8 @@ pipeline {
sh "docker manifest annotate ${DOCKERHUB_IMAGE}:${EXT_RELEASE}-ls${LS_TAG_NUMBER} ${DOCKERHUB_IMAGE}:arm32v6-${EXT_RELEASE}-ls${LS_TAG_NUMBER} --os linux --arch arm"
sh "docker manifest annotate ${DOCKERHUB_IMAGE}:${EXT_RELEASE}-ls${LS_TAG_NUMBER} ${DOCKERHUB_IMAGE}:arm64v8-${EXT_RELEASE}-ls${LS_TAG_NUMBER} --os linux --arch arm64 --variant armv8"
echo 'Pushing by manifest tags'
sh "docker manifest push ${DOCKERHUB_IMAGE}:latest"
sh "docker manifest push ${DOCKERHUB_IMAGE}:${EXT_RELEASE}-ls${LS_TAG_NUMBER}"
sh "docker manifest push --purge ${DOCKERHUB_IMAGE}:latest"
sh "docker manifest push --purge ${DOCKERHUB_IMAGE}:${EXT_RELEASE}-ls${LS_TAG_NUMBER}"
}
}
}
Expand Down Expand Up @@ -717,8 +717,8 @@ pipeline {
sh "docker manifest annotate ${DEV_DOCKERHUB_IMAGE}:${EXT_RELEASE}-pkg-${PACKAGE_TAG}-dev-${COMMIT_SHA} ${DEV_DOCKERHUB_IMAGE}:arm32v6-${EXT_RELEASE}-pkg-${PACKAGE_TAG}-dev-${COMMIT_SHA} --os linux --arch arm"
sh "docker manifest annotate ${DEV_DOCKERHUB_IMAGE}:${EXT_RELEASE}-pkg-${PACKAGE_TAG}-dev-${COMMIT_SHA} ${DEV_DOCKERHUB_IMAGE}:arm64v8-${EXT_RELEASE}-pkg-${PACKAGE_TAG}-dev-${COMMIT_SHA} --os linux --arch arm64 --variant armv8"
echo 'Pushing by manifest tags'
sh "docker manifest push ${DEV_DOCKERHUB_IMAGE}:latest"
sh "docker manifest push ${DEV_DOCKERHUB_IMAGE}:${EXT_RELEASE}-pkg-${PACKAGE_TAG}-dev-${COMMIT_SHA}"
sh "docker manifest push --purge ${DEV_DOCKERHUB_IMAGE}:latest"
sh "docker manifest push --purge ${DEV_DOCKERHUB_IMAGE}:${EXT_RELEASE}-pkg-${PACKAGE_TAG}-dev-${COMMIT_SHA}"
}
script{
env.DOCKERHUB_LINK = sh(
Expand Down Expand Up @@ -815,8 +815,8 @@ pipeline {
sh "docker manifest annotate ${PR_DOCKERHUB_IMAGE}:${EXT_RELEASE}-pkg-${PACKAGE_TAG}-pr-${PULL_REQUEST} ${PR_DOCKERHUB_IMAGE}:arm32v6-${EXT_RELEASE}-pkg-${PACKAGE_TAG}-pr-${PULL_REQUEST} --os linux --arch arm"
sh "docker manifest annotate ${PR_DOCKERHUB_IMAGE}:${EXT_RELEASE}-pkg-${PACKAGE_TAG}-pr-${PULL_REQUEST} ${PR_DOCKERHUB_IMAGE}:arm64v8-${EXT_RELEASE}-pkg-${PACKAGE_TAG}-pr-${PULL_REQUEST} --os linux --arch arm64 --variant armv8"
echo 'Pushing by manifest tags'
sh "docker manifest push ${PR_DOCKERHUB_IMAGE}:latest"
sh "docker manifest push ${PR_DOCKERHUB_IMAGE}:${EXT_RELEASE}-pkg-${PACKAGE_TAG}-pr-${PULL_REQUEST}"
sh "docker manifest push --purge ${PR_DOCKERHUB_IMAGE}:latest"
sh "docker manifest push --purge ${PR_DOCKERHUB_IMAGE}:${EXT_RELEASE}-pkg-${PACKAGE_TAG}-pr-${PULL_REQUEST}"
}
script{
env.CODE_URL = sh(
Expand Down
Empty file modified qemu-aarch64-static
100644 → 100755
View file
Empty file.
Empty file modified qemu-arm-static
100644 → 100755
View file
Empty file.
2 changes: 1 addition & 1 deletion root/etc/cont-init.d/50-config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ sed -i "s/DB_HOST=localhost/DB_HOST=${DB_HOST}/g" /var/www/html/.env

sed -i "s/DB_DATABASE=database_database/DB_DATABASE=${DB_DATABASE}/g" /var/www/html/.env

sed -i "s/DB_USERNAME=database_username/DB_USER=${DB_USER}/g" /var/www/html/.env
sed -i "s/DB_USERNAME=database_username/DB_USERNAME=${DB_USER}/g" /var/www/html/.env

sed -i "s/DB_PASSWORD=database_user_password/DB_PASSWORD=${DB_PASS}/g" /var/www/html/.env

Expand Down

0 comments on commit 48047ab

Please sign in to comment.