Skip to content

Commit 2ace15f

Browse files
thespadthespad
authored
Merge pull request #103 from linuxserver/3.14
2 parents f6fb87f + 51adb5c commit 2ace15f

File tree

6 files changed

+147
-167
lines changed

6 files changed

+147
-167
lines changed

‎Dockerfile‎

Lines changed: 48 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.12
1+
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14
22

33
# set version label
44
ARG BUILD_DATE
@@ -11,63 +11,54 @@ LABEL maintainer="homerr"
1111
ARG BOOKSTACK_RELEASE
1212

1313
RUN \
14-
echo "**** install packages ****" && \
15-
apk add --no-cache \
16-
curl \
17-
fontconfig \
18-
memcached \
19-
netcat-openbsd \
20-
php7-ctype \
21-
php7-curl \
22-
php7-dom \
23-
php7-gd \
24-
php7-ldap \
25-
php7-mbstring \
26-
php7-memcached \
27-
php7-mysqlnd \
28-
php7-openssl \
29-
php7-pdo_mysql \
30-
php7-phar \
31-
php7-simplexml \
32-
php7-tokenizer \
33-
qt5-qtbase \
34-
tar \
35-
ttf-freefont \
36-
wkhtmltopdf && \
37-
echo "**** tidy bug fix ****" && \
38-
curl -s \
39-
http://dl-cdn.alpinelinux.org/alpine/v3.7/community/x86_64/tidyhtml-libs-5.4.0-r0.apk | \
40-
tar xfz - -C / && \
41-
rm -f /usr/lib/libtidy.so.5.6.0 && \
42-
echo "**** configure php-fpm ****" && \
43-
sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \
44-
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \
45-
echo "**** fetch bookstack ****" && \
46-
mkdir -p\
47-
/var/www/html && \
48-
if [ -z ${BOOKSTACK_RELEASE+x} ]; then \
49-
BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \
50-
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
51-
fi && \
52-
curl -o \
53-
/tmp/bookstack.tar.gz -L \
54-
"https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \
55-
tar xf \
56-
/tmp/bookstack.tar.gz -C \
57-
/var/www/html/ --strip-components=1 && \
58-
echo "**** install composer ****" && \
59-
cd /tmp && \
60-
curl -sS https://getcomposer.org/installer | php && \
61-
mv /tmp/composer.phar /usr/local/bin/composer && \
62-
echo "**** install composer dependencies ****" && \
63-
composer install -d /var/www/html/ && \
64-
echo "**** cleanup ****" && \
65-
rm -rf \
66-
/root/.composer \
67-
/tmp/*
14+
echo "**** install packages ****" && \
15+
apk add --no-cache \
16+
curl \
17+
composer \
18+
fontconfig \
19+
memcached \
20+
netcat-openbsd \
21+
php7-ctype \
22+
php7-curl \
23+
php7-dom \
24+
php7-gd \
25+
php7-ldap \
26+
php7-mbstring \
27+
php7-memcached \
28+
php7-mysqlnd \
29+
php7-openssl \
30+
php7-pdo_mysql \
31+
php7-phar \
32+
php7-simplexml \
33+
php7-tokenizer \
34+
qt5-qtbase \
35+
tar \
36+
ttf-freefont \
37+
wkhtmltopdf && \
38+
echo "**** configure php-fpm ****" && \
39+
sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \
40+
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \
41+
echo "**** fetch bookstack ****" && \
42+
mkdir -p\
43+
/var/www/html && \
44+
if [ -z ${BOOKSTACK_RELEASE+x} ]; then \
45+
BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \
46+
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
47+
fi && \
48+
curl -o \
49+
/tmp/bookstack.tar.gz -L \
50+
"https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \
51+
tar xf \
52+
/tmp/bookstack.tar.gz -C \
53+
/var/www/html/ --strip-components=1 && \
54+
echo "**** install composer dependencies ****" && \
55+
composer install -d /var/www/html/ && \
56+
echo "**** cleanup ****" && \
57+
rm -rf \
58+
/root/.composer \
59+
/tmp/*
6860

69-
# copy local files
7061
COPY root/ /
7162

72-
# ports and volumes
7363
VOLUME /config
64+
EXPOSE 80

‎Dockerfile.aarch64‎

Lines changed: 48 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.12
1+
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.14
22

33
# set version label
44
ARG BUILD_DATE
@@ -11,63 +11,54 @@ LABEL maintainer="homerr"
1111
ARG BOOKSTACK_RELEASE
1212

1313
RUN \
14-
echo "**** install packages ****" && \
15-
apk add --no-cache \
16-
curl \
17-
fontconfig \
18-
memcached \
19-
netcat-openbsd \
20-
php7-ctype \
21-
php7-curl \
22-
php7-dom \
23-
php7-gd \
24-
php7-ldap \
25-
php7-mbstring \
26-
php7-memcached \
27-
php7-mysqlnd \
28-
php7-openssl \
29-
php7-pdo_mysql \
30-
php7-phar \
31-
php7-simplexml \
32-
php7-tokenizer \
33-
qt5-qtbase \
34-
tar \
35-
ttf-freefont \
36-
wkhtmltopdf && \
37-
echo "**** tidy bug fix ****" && \
38-
curl -s \
39-
http://dl-cdn.alpinelinux.org/alpine/v3.7/community/aarch64/tidyhtml-libs-5.4.0-r0.apk | \
40-
tar xfz - -C / && \
41-
rm -f /usr/lib/libtidy.so.5.6.0 && \
42-
echo "**** configure php-fpm ****" && \
43-
sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \
44-
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \
45-
echo "**** fetch bookstack ****" && \
46-
mkdir -p\
47-
/var/www/html && \
48-
if [ -z ${BOOKSTACK_RELEASE+x} ]; then \
49-
BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \
50-
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
51-
fi && \
52-
curl -o \
53-
/tmp/bookstack.tar.gz -L \
54-
"https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \
55-
tar xf \
56-
/tmp/bookstack.tar.gz -C \
57-
/var/www/html/ --strip-components=1 && \
58-
echo "**** install composer ****" && \
59-
cd /tmp && \
60-
curl -sS https://getcomposer.org/installer | php && \
61-
mv /tmp/composer.phar /usr/local/bin/composer && \
62-
echo "**** install composer dependencies ****" && \
63-
composer install -d /var/www/html/ && \
64-
echo "**** cleanup ****" && \
65-
rm -rf \
66-
/root/.composer \
67-
/tmp/*
14+
echo "**** install packages ****" && \
15+
apk add --no-cache \
16+
curl \
17+
composer \
18+
fontconfig \
19+
memcached \
20+
netcat-openbsd \
21+
php7-ctype \
22+
php7-curl \
23+
php7-dom \
24+
php7-gd \
25+
php7-ldap \
26+
php7-mbstring \
27+
php7-memcached \
28+
php7-mysqlnd \
29+
php7-openssl \
30+
php7-pdo_mysql \
31+
php7-phar \
32+
php7-simplexml \
33+
php7-tokenizer \
34+
qt5-qtbase \
35+
tar \
36+
ttf-freefont \
37+
wkhtmltopdf && \
38+
echo "**** configure php-fpm ****" && \
39+
sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \
40+
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \
41+
echo "**** fetch bookstack ****" && \
42+
mkdir -p\
43+
/var/www/html && \
44+
if [ -z ${BOOKSTACK_RELEASE+x} ]; then \
45+
BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \
46+
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
47+
fi && \
48+
curl -o \
49+
/tmp/bookstack.tar.gz -L \
50+
"https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \
51+
tar xf \
52+
/tmp/bookstack.tar.gz -C \
53+
/var/www/html/ --strip-components=1 && \
54+
echo "**** install composer dependencies ****" && \
55+
composer install -d /var/www/html/ && \
56+
echo "**** cleanup ****" && \
57+
rm -rf \
58+
/root/.composer \
59+
/tmp/*
6860

69-
# copy local files
7061
COPY root/ /
7162

72-
# ports and volumes
7363
VOLUME /config
64+
EXPOSE 80

‎Dockerfile.armhf‎

Lines changed: 48 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.12
1+
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.14
22

33
# set version label
44
ARG BUILD_DATE
@@ -11,58 +11,54 @@ LABEL maintainer="homerr"
1111
ARG BOOKSTACK_RELEASE
1212

1313
RUN \
14-
echo "**** install packages ****" && \
15-
apk add --no-cache \
16-
curl \
17-
fontconfig \
18-
memcached \
19-
netcat-openbsd \
20-
php7-ctype \
21-
php7-curl \
22-
php7-dom \
23-
php7-gd \
24-
php7-ldap \
25-
php7-mbstring \
26-
php7-memcached \
27-
php7-mysqlnd \
28-
php7-openssl \
29-
php7-pdo_mysql \
30-
php7-phar \
31-
php7-simplexml \
32-
php7-tokenizer \
33-
qt5-qtbase \
34-
tar \
35-
ttf-freefont \
36-
wkhtmltopdf && \
37-
echo "**** configure php-fpm ****" && \
38-
sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \
39-
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \
40-
echo "**** fetch bookstack ****" && \
41-
mkdir -p\
42-
/var/www/html && \
43-
if [ -z ${BOOKSTACK_RELEASE+x} ]; then \
44-
BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \
45-
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
46-
fi && \
47-
curl -o \
48-
/tmp/bookstack.tar.gz -L \
49-
"https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \
50-
tar xf \
51-
/tmp/bookstack.tar.gz -C \
52-
/var/www/html/ --strip-components=1 && \
53-
echo "**** install composer ****" && \
54-
cd /tmp && \
55-
curl -sS https://getcomposer.org/installer | php && \
56-
mv /tmp/composer.phar /usr/local/bin/composer && \
57-
echo "**** install composer dependencies ****" && \
58-
composer install -d /var/www/html/ && \
59-
echo "**** cleanup ****" && \
60-
rm -rf \
61-
/root/.composer \
62-
/tmp/*
14+
echo "**** install packages ****" && \
15+
apk add --no-cache \
16+
curl \
17+
composer \
18+
fontconfig \
19+
memcached \
20+
netcat-openbsd \
21+
php7-ctype \
22+
php7-curl \
23+
php7-dom \
24+
php7-gd \
25+
php7-ldap \
26+
php7-mbstring \
27+
php7-memcached \
28+
php7-mysqlnd \
29+
php7-openssl \
30+
php7-pdo_mysql \
31+
php7-phar \
32+
php7-simplexml \
33+
php7-tokenizer \
34+
qt5-qtbase \
35+
tar \
36+
ttf-freefont \
37+
wkhtmltopdf && \
38+
echo "**** configure php-fpm ****" && \
39+
sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \
40+
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \
41+
echo "**** fetch bookstack ****" && \
42+
mkdir -p\
43+
/var/www/html && \
44+
if [ -z ${BOOKSTACK_RELEASE+x} ]; then \
45+
BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \
46+
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
47+
fi && \
48+
curl -o \
49+
/tmp/bookstack.tar.gz -L \
50+
"https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \
51+
tar xf \
52+
/tmp/bookstack.tar.gz -C \
53+
/var/www/html/ --strip-components=1 && \
54+
echo "**** install composer dependencies ****" && \
55+
composer install -d /var/www/html/ && \
56+
echo "**** cleanup ****" && \
57+
rm -rf \
58+
/root/.composer \
59+
/tmp/*
6360

64-
# copy local files
6561
COPY root/ /
6662

67-
# ports and volumes
6863
VOLUME /config
64+
EXPOSE 80

‎Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pipeline {
2929
DIST_IMAGE = 'alpine'
3030
MULTIARCH = 'true'
3131
CI = 'true'
32-
CI_WEB = 'false'
32+
CI_WEB = 'true'
3333
CI_PORT = '80'
3434
CI_SSL = 'false'
3535
CI_DELAY = '30'

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
269269

270270
## Versions
271271

272+
* **11.07.21:** - Rebase to Alpine 3.14.
272273
* **12.01.21:** - Remove unused requirement, as of release 0.31.0.
273274
* **17.12.20:** - Make APP_URL var required (upstream changes).
274275
* **17.09.20:** - Rebase to alpine 3.12. Fix APP_URL setting. Bump php post max and upload max filesizes to 100MB by default.

‎readme-vars.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ app_setup_block: |
101101
102102
# changelog
103103
changelogs:
104+
- { date: "11.07.21:", desc: "Rebase to Alpine 3.14." }
104105
- { date: "12.01.21:", desc: "Remove unused requirement, as of release 0.31.0." }
105106
- { date: "17.12.20:", desc: "Make APP_URL var required (upstream changes)." }
106107
- { date: "17.09.20:", desc: "Rebase to alpine 3.12. Fix APP_URL setting. Bump php post max and upload max filesizes to 100MB by default." }

0 commit comments

Comments
 (0)