Skip to content

Commit 493898e

Browse files
nemchiknemchik
authored
Merge pull request #43 from linuxserver/standard-base
Standard base
2 parents 7ea5b3d + 75d499e commit 493898e

File tree

10 files changed

+257
-194
lines changed

10 files changed

+257
-194
lines changed

‎Dockerfile‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.13
1+
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.15
22

33
# set version label
44
ARG BUILD_DATE
@@ -8,48 +8,48 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
88
LABEL maintainer="chbmb"
99

1010
RUN \
11-
echo "**** install build packages ****" && \
12-
apk add --no-cache --virtual=build-dependencies \
13-
tar \
14-
xmlstarlet && \
15-
echo "**** install runtime packages ****" && \
16-
apk add --no-cache \
17-
curl \
18-
imagemagick \
19-
php7-bz2 \
20-
php7-ctype \
21-
php7-curl \
22-
php7-dom \
23-
php7-gd \
24-
php7-iconv \
25-
php7-ldap \
26-
php7-pecl-imagick \
27-
php7-pdo_mysql \
28-
php7-pdo_pgsql \
29-
php7-pdo_sqlite \
30-
php7-sqlite3 \
31-
php7-xml \
32-
php7-zip && \
33-
echo "**** install dokuwiki ****" && \
34-
if [ -z ${DOKUWIKI_RELEASE+x} ]; then \
35-
DOKUWIKI_RELEASE=$(wget https://download.dokuwiki.org/rss -O - 2>/dev/null | \
36-
xmlstarlet sel -T -t -v '/rss/channel/item[1]/link' | \
37-
cut -d'-' -f2-4 | cut -d'.' -f1 ); \
38-
fi && \
39-
curl -o \
40-
/tmp/dokuwiki.tar.gz -L \
41-
"https://github.com/splitbrain/dokuwiki/archive/release_stable_${DOKUWIKI_RELEASE}.tar.gz" && \
42-
mkdir -p \
43-
/app/dokuwiki && \
44-
tar xf \
45-
/tmp/dokuwiki.tar.gz -C \
46-
/app/dokuwiki --strip-components=1 && \
47-
echo "**** cleanup ****" && \
48-
apk del --purge \
49-
build-dependencies && \
50-
rm -rf \
51-
/root/.cache \
52-
/tmp/*
11+
echo "**** install build packages ****" && \
12+
apk add --no-cache --virtual=build-dependencies \
13+
tar \
14+
xmlstarlet && \
15+
echo "**** install runtime packages ****" && \
16+
apk add --no-cache \
17+
curl \
18+
imagemagick \
19+
php8-bz2 \
20+
php8-ctype \
21+
php8-curl \
22+
php8-dom \
23+
php8-gd \
24+
php8-iconv \
25+
php8-ldap \
26+
php8-pdo_mysql \
27+
php8-pdo_pgsql \
28+
php8-pdo_sqlite \
29+
php8-pecl-imagick \
30+
php8-sqlite3 \
31+
php8-xml \
32+
php8-zip && \
33+
echo "**** install dokuwiki ****" && \
34+
if [ -z ${DOKUWIKI_RELEASE+x} ]; then \
35+
DOKUWIKI_RELEASE=$(wget https://download.dokuwiki.org/rss -O - 2>/dev/null | \
36+
xmlstarlet sel -T -t -v '/rss/channel/item[1]/link' | \
37+
cut -d'-' -f2-4 | cut -d'.' -f1 ); \
38+
fi && \
39+
curl -o \
40+
/tmp/dokuwiki.tar.gz -L \
41+
"https://github.com/splitbrain/dokuwiki/archive/release_stable_${DOKUWIKI_RELEASE}.tar.gz" && \
42+
mkdir -p \
43+
/app/www/public && \
44+
tar xf \
45+
/tmp/dokuwiki.tar.gz -C \
46+
/app/www/public --strip-components=1 && \
47+
echo "**** cleanup ****" && \
48+
apk del --purge \
49+
build-dependencies && \
50+
rm -rf \
51+
/root/.cache \
52+
/tmp/*
5353

5454
# copy local files
5555
COPY root/ /

‎Dockerfile.aarch64‎

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

33
# set version label
44
ARG BUILD_DATE
@@ -8,48 +8,48 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
88
LABEL maintainer="chbmb"
99

1010
RUN \
11-
echo "**** install build packages ****" && \
12-
apk add --no-cache --virtual=build-dependencies \
13-
tar \
14-
xmlstarlet && \
15-
echo "**** install runtime packages ****" && \
16-
apk add --no-cache \
17-
curl \
18-
imagemagick \
19-
php7-bz2 \
20-
php7-ctype \
21-
php7-curl \
22-
php7-dom \
23-
php7-gd \
24-
php7-iconv \
25-
php7-ldap \
26-
php7-pecl-imagick \
27-
php7-pdo_mysql \
28-
php7-pdo_pgsql \
29-
php7-pdo_sqlite \
30-
php7-sqlite3 \
31-
php7-xml \
32-
php7-zip && \
33-
echo "**** install dokuwiki ****" && \
34-
if [ -z ${DOKUWIKI_RELEASE+x} ]; then \
35-
DOKUWIKI_RELEASE=$(wget https://download.dokuwiki.org/rss -O - 2>/dev/null | \
36-
xmlstarlet sel -T -t -v '/rss/channel/item[1]/link' | \
37-
cut -d'-' -f2-4 | cut -d'.' -f1 ); \
38-
fi && \
39-
curl -o \
40-
/tmp/dokuwiki.tar.gz -L \
41-
"https://github.com/splitbrain/dokuwiki/archive/release_stable_${DOKUWIKI_RELEASE}.tar.gz" && \
42-
mkdir -p \
43-
/app/dokuwiki && \
44-
tar xf \
45-
/tmp/dokuwiki.tar.gz -C \
46-
/app/dokuwiki --strip-components=1 && \
47-
echo "**** cleanup ****" && \
48-
apk del --purge \
49-
build-dependencies && \
50-
rm -rf \
51-
/root/.cache \
52-
/tmp/*
11+
echo "**** install build packages ****" && \
12+
apk add --no-cache --virtual=build-dependencies \
13+
tar \
14+
xmlstarlet && \
15+
echo "**** install runtime packages ****" && \
16+
apk add --no-cache \
17+
curl \
18+
imagemagick \
19+
php8-bz2 \
20+
php8-ctype \
21+
php8-curl \
22+
php8-dom \
23+
php8-gd \
24+
php8-iconv \
25+
php8-ldap \
26+
php8-pdo_mysql \
27+
php8-pdo_pgsql \
28+
php8-pdo_sqlite \
29+
php8-pecl-imagick \
30+
php8-sqlite3 \
31+
php8-xml \
32+
php8-zip && \
33+
echo "**** install dokuwiki ****" && \
34+
if [ -z ${DOKUWIKI_RELEASE+x} ]; then \
35+
DOKUWIKI_RELEASE=$(wget https://download.dokuwiki.org/rss -O - 2>/dev/null | \
36+
xmlstarlet sel -T -t -v '/rss/channel/item[1]/link' | \
37+
cut -d'-' -f2-4 | cut -d'.' -f1 ); \
38+
fi && \
39+
curl -o \
40+
/tmp/dokuwiki.tar.gz -L \
41+
"https://github.com/splitbrain/dokuwiki/archive/release_stable_${DOKUWIKI_RELEASE}.tar.gz" && \
42+
mkdir -p \
43+
/app/www/public && \
44+
tar xf \
45+
/tmp/dokuwiki.tar.gz -C \
46+
/app/www/public --strip-components=1 && \
47+
echo "**** cleanup ****" && \
48+
apk del --purge \
49+
build-dependencies && \
50+
rm -rf \
51+
/root/.cache \
52+
/tmp/*
5353

5454
# copy local files
5555
COPY root/ /

‎Dockerfile.armhf‎

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

33
# set version label
44
ARG BUILD_DATE
@@ -8,48 +8,48 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
88
LABEL maintainer="chbmb"
99

1010
RUN \
11-
echo "**** install build packages ****" && \
12-
apk add --no-cache --virtual=build-dependencies \
13-
tar \
14-
xmlstarlet && \
15-
echo "**** install runtime packages ****" && \
16-
apk add --no-cache \
17-
curl \
18-
imagemagick \
19-
php7-bz2 \
20-
php7-ctype \
21-
php7-curl \
22-
php7-dom \
23-
php7-gd \
24-
php7-iconv \
25-
php7-ldap \
26-
php7-pecl-imagick \
27-
php7-pdo_mysql \
28-
php7-pdo_pgsql \
29-
php7-pdo_sqlite \
30-
php7-sqlite3 \
31-
php7-xml \
32-
php7-zip && \
33-
echo "**** install dokuwiki ****" && \
34-
if [ -z ${DOKUWIKI_RELEASE+x} ]; then \
35-
DOKUWIKI_RELEASE=$(wget https://download.dokuwiki.org/rss -O - 2>/dev/null | \
36-
xmlstarlet sel -T -t -v '/rss/channel/item[1]/link' | \
37-
cut -d'-' -f2-4 | cut -d'.' -f1 ); \
38-
fi && \
39-
curl -o \
40-
/tmp/dokuwiki.tar.gz -L \
41-
"https://github.com/splitbrain/dokuwiki/archive/release_stable_${DOKUWIKI_RELEASE}.tar.gz" && \
42-
mkdir -p \
43-
/app/dokuwiki && \
44-
tar xf \
45-
/tmp/dokuwiki.tar.gz -C \
46-
/app/dokuwiki --strip-components=1 && \
47-
echo "**** cleanup ****" && \
48-
apk del --purge \
49-
build-dependencies && \
50-
rm -rf \
51-
/root/.cache \
52-
/tmp/*
11+
echo "**** install build packages ****" && \
12+
apk add --no-cache --virtual=build-dependencies \
13+
tar \
14+
xmlstarlet && \
15+
echo "**** install runtime packages ****" && \
16+
apk add --no-cache \
17+
curl \
18+
imagemagick \
19+
php8-bz2 \
20+
php8-ctype \
21+
php8-curl \
22+
php8-dom \
23+
php8-gd \
24+
php8-iconv \
25+
php8-ldap \
26+
php8-pdo_mysql \
27+
php8-pdo_pgsql \
28+
php8-pdo_sqlite \
29+
php8-pecl-imagick \
30+
php8-sqlite3 \
31+
php8-xml \
32+
php8-zip && \
33+
echo "**** install dokuwiki ****" && \
34+
if [ -z ${DOKUWIKI_RELEASE+x} ]; then \
35+
DOKUWIKI_RELEASE=$(wget https://download.dokuwiki.org/rss -O - 2>/dev/null | \
36+
xmlstarlet sel -T -t -v '/rss/channel/item[1]/link' | \
37+
cut -d'-' -f2-4 | cut -d'.' -f1 ); \
38+
fi && \
39+
curl -o \
40+
/tmp/dokuwiki.tar.gz -L \
41+
"https://github.com/splitbrain/dokuwiki/archive/release_stable_${DOKUWIKI_RELEASE}.tar.gz" && \
42+
mkdir -p \
43+
/app/www/public && \
44+
tar xf \
45+
/tmp/dokuwiki.tar.gz -C \
46+
/app/www/public --strip-components=1 && \
47+
echo "**** cleanup ****" && \
48+
apk del --purge \
49+
build-dependencies && \
50+
rm -rf \
51+
/root/.cache \
52+
/tmp/*
5353

5454
# copy local files
5555
COPY root/ /

‎README.md‎

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

225225
## Versions
226226

227+
* **20.08.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).
227228
* **20.07.21:** - Add php7-dom, fixes minor issues in sprintdoc template.
228229
* **15.04.21:** - Add `vendor` folder to deny list.
229230
* **21.02.21:** - Store search index outside of container, set absolute (default) path for `savedir`.

‎readme-vars.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ app_setup_block: |
4040
Upon first install go to `http://$IP:$PORT/install.php` once you have completed the setup, restart the container, login as admin and set "Use nice URLs" in the `admin/Configuration Settings` panel to `.htaccess` and tick `Use slash as namespace separator in URLs` to enable [nice URLs](https://www.dokuwiki.org/rewrite) you will find the webui at `http://$IP:$PORT/`, for more info see [{{ project_name|capitalize }}]({{ project_url }})
4141
# changelog
4242
changelogs:
43+
- { date: "20.08.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." }
4344
- { date: "20.07.21:", desc: "Add php7-dom, fixes minor issues in sprintdoc template." }
4445
- { date: "15.04.21:", desc: "Add `vendor` folder to deny list." }
4546
- { date: "21.02.21:", desc: "Store search index outside of container, set absolute (default) path for `savedir`." }

‎root/app/dokuwiki/index.html‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<html>
2+
<head>
3+
<title>Upgrade Required!</title>
4+
<style>
5+
body{
6+
font-family: Helvetica, Arial, sans-serif;
7+
}
8+
.message{
9+
width:440px;
10+
padding:20px 40px;
11+
margin:0 auto;
12+
background-color:#f9f9f9;
13+
border:1px solid #ddd;
14+
color: #1e3d62;
15+
}
16+
center{
17+
margin:40px 0;
18+
}
19+
h1{
20+
font-size: 18px;
21+
line-height: 26px;
22+
}
23+
p{
24+
font-size: 12px;
25+
}
26+
a{
27+
color: rgb(207, 48, 139);
28+
}
29+
</style>
30+
</head>
31+
<body>
32+
<div class="message">
33+
<h1>Upgrade Required!</h1>
34+
<p>The application inside this image has been moved to a new folder.</p>
35+
<p>You will need to update your <strong>/config/nginx/nginx.conf</strong> and <strong>/config/nginx/site-confs/default.conf</strong> in order for the application to work.</p>
36+
<p>New config samples are located at <strong>/config/nginx/nginx.conf.sample</strong> and <strong>/config/nginx/site-confs/default.conf.sample</strong></p>
37+
<p>Please review our announcement: <a target="_blank" href="https://info.linuxserver.io/issues/2022-08-20-nginx-base/">Significant changes to nginx based images</a></p>
38+
</div>
39+
</body>
40+
</html>

‎root/defaults/default‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)