Skip to content

Commit a3bddfc

Browse files
sparklyballssparklyballs
authored
Merge pull request #6 from linuxserver/tidy_up
some tidying and stuff
2 parents 7500e19 + 819404a commit a3bddfc

File tree

6 files changed

+182
-197
lines changed

6 files changed

+182
-197
lines changed

Diff for: ‎.github/ISSUE_TEMPLATE.md

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<!--- Provide a general summary of the issue in the Title above -->
2+
3+
[linuxserverurl]: https://linuxserver.io
4+
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
5+
6+
7+
<!--- If you have an issue with the project, please provide us with the following information -->
8+
9+
<!--- Host OS -->
10+
<!--- Command line users, your run/create command, GUI/Unraid users, a screenshot of your template settings. -->
11+
<!--- Docker log output, docker log <container-name> -->
12+
<!--- Mention if you're using symlinks on any of the volume mounts. -->
13+
14+
15+
<!--- If you have a suggestion or fix for the project, please provide us with the following information -->
16+
17+
<!--- What you think your suggestion brings to the project, or fixes with the project -->
18+
<!--- If it's a fix, would it be better suited as a Pull request to the repo ? -->
19+
20+
## Thanks, team linuxserver.io
21+

Diff for: ‎.github/PULL_REQUEST_TEMPLATE.md

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<!--- Provide a general summary of your changes in the Title above -->
2+
3+
[linuxserverurl]: https://linuxserver.io
4+
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
5+
6+
7+
<!--- Before submitting a pull request please check the following -->
8+
9+
<!--- That you have made a branch in your fork, we'd rather not merge from your master -->
10+
<!--- That if the PR is addressing an existing issue include, closes #<issue number> , in the body of the PR commit message -->
11+
<!--- You have included links to any files / patches etc your PR may be using in the body of the PR commit message -->
12+
<!--- -->
13+
14+
## Thanks, team linuxserver.io
15+

Diff for: ‎Dockerfile.aarch64

+47-62
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,60 @@
1-
# using ideas/code from other sparklyballs templates
2-
# set variable to get archive based on github api data (sparklyballs heimdall inspiration)
3-
41
FROM lsiobase/alpine.nginx.arm64:3.7
2+
53
# Add qemu to build on x86_64 systems
64
COPY qemu-aarch64-static /usr/bin
5+
76
# set version label
87
ARG BUILD_DATE
98
ARG VERSION
10-
ARG BOOKSTACK_RELEASE
119
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
1210
LABEL maintainer="homerr"
1311

14-
# install packages
15-
RUN \
16-
echo "**** install build packages ****" && \
17-
apk add --no-cache \
18-
curl \
19-
php7-openssl \
20-
php7-pdo_mysql \
21-
php7-mbstring \
22-
php7-tidy \
23-
php7-phar \
24-
php7-dom \
25-
php7-tokenizer \
26-
php7-gd \
27-
php7-mysqlnd \
28-
php7-tidy \
29-
php7-simplexml \
30-
php7-ctype \
31-
tar && \
32-
33-
echo "**** configure php-fpm to pass env vars ****" && \
34-
sed -i \
35-
's/;clear_env = no/clear_env = no/g' \
36-
/etc/php7/php-fpm.d/www.conf && \
37-
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \
38-
39-
echo "**** get bookstack ****" && \
40-
41-
mkdir -p\
42-
/var/www/html && \
43-
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-
49-
curl -o \
50-
/tmp/bookstack.tar.gz -L \
51-
"https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \
52-
53-
tar xf \
54-
/tmp/bookstack.tar.gz -C \
55-
/var/www/html/ --strip-components=1 && \
56-
57-
cp /var/www/html/.env.example /var/www/html/.env && \
58-
59-
echo "**** get composer ****" && \
60-
61-
cd /tmp && \
62-
curl -sS https://getcomposer.org/installer | php && \
63-
mv /tmp/composer.phar /usr/local/bin/composer && \
64-
65-
echo "**** run composer install ****" && \
66-
67-
composer install -d /var/www/html/ && \
12+
# package versions
13+
ARG BOOKSTACK_RELEASE
6814

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

7459
# copy local files
7560
COPY root/ /

Diff for: ‎Dockerfile.amd64

+45-60
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,57 @@
1-
# using ideas/code from other thelamer & sparklyballs lsio templates
21
FROM lsiobase/alpine.nginx:3.7
32

43
# set version label
54
ARG BUILD_DATE
65
ARG VERSION
7-
ARG BOOKSTACK_RELEASE
86
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
97
LABEL maintainer="homerr"
108

11-
# install packages
12-
RUN \
13-
echo "**** install build packages ****" && \
14-
apk add --no-cache \
15-
curl \
16-
php7-openssl \
17-
php7-pdo_mysql \
18-
php7-mbstring \
19-
php7-tidy \
20-
php7-phar \
21-
php7-dom \
22-
php7-tokenizer \
23-
php7-gd \
24-
php7-mysqlnd \
25-
php7-tidy \
26-
php7-simplexml \
27-
php7-ctype \
28-
tar && \
29-
30-
echo "**** configure php-fpm to pass env vars ****" && \
31-
sed -i \
32-
's/;clear_env = no/clear_env = no/g' \
33-
/etc/php7/php-fpm.d/www.conf && \
34-
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \
35-
36-
echo "**** get bookstack ****" && \
37-
38-
mkdir -p\
39-
/var/www/html && \
40-
41-
if [ -z ${BOOKSTACK_RELEASE+x} ]; then \
42-
BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \
43-
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
44-
fi && \
45-
46-
curl -o \
47-
/tmp/bookstack.tar.gz -L \
48-
"https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \
49-
50-
tar xf \
51-
/tmp/bookstack.tar.gz -C \
52-
/var/www/html/ --strip-components=1 && \
53-
54-
cp /var/www/html/.env.example /var/www/html/.env && \
55-
56-
echo "**** get composer ****" && \
57-
58-
cd /tmp && \
59-
curl -sS https://getcomposer.org/installer | php && \
60-
mv /tmp/composer.phar /usr/local/bin/composer && \
61-
62-
echo "**** run composer install ****" && \
63-
64-
composer install -d /var/www/html/ && \
9+
# package versions
10+
ARG BOOKSTACK_RELEASE
6511

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

7156
# copy local files
7257
COPY root/ /

0 commit comments

Comments
 (0)