Skip to content

Commit 45123e3

Browse files
authored
Merge pull request #18 from linuxserver/continuation_lines
fix continuation lines xenial
2 parents a077eb6 + 5b0888a commit 45123e3

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

Dockerfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
FROM lsiobase/xenial
2-
MAINTAINER sparklyballs
3-
4-
# environment variables
5-
ARG DEBIAN_FRONTEND="noninteractive"
6-
ENV MYSQL_DIR="/config"
7-
ENV DATADIR=$MYSQL_DIR/databases
82

93
# set version label
104
ARG BUILD_DATE
115
ARG VERSION
126
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
7+
LABEL maintainer="sparklyballs"
8+
9+
# environment variables
10+
ARG DEBIAN_FRONTEND="noninteractive"
11+
ENV MYSQL_DIR="/config"
12+
ENV DATADIR=$MYSQL_DIR/databases
1313

14-
# update apt and install packages
1514
RUN \
16-
apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 && \
15+
echo "**** add mariadb repository ****" && \
16+
apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 && \
1717
echo "deb [arch=amd64,i386] http://mirrors.coreix.net/mariadb/repo/10.1/ubuntu xenial main" >> /etc/apt/sources.list.d/mariadb.list && \
1818
echo "deb-src http://mirrors.coreix.net/mariadb/repo/10.1/ubuntu xenial main" >> /etc/apt/sources.list.d/mariadb.list && \
19+
echo "**** install packages ****" && \
1920
apt-get update && \
2021
apt-get install -y \
2122
mariadb-server && \
22-
23-
# cleanup
23+
echo "**** cleanup ****" && \
2424
rm -rf \
2525
/tmp/* \
2626
/var/lib/apt/lists/* \

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ Find custom.cnf in /config for config changes (restart container for them to tak
8989

9090
## Versions
9191

92+
+ **09.12.17:** Fix continuation lines.
9293
+ **12.09.17:** Gracefully shut down mariadb
9394
+ **27.10.16:** Implement linting suggestions on database init script.
9495
+ **11.10.16:** Rebase to ubuntu xenial, add version labelling.

0 commit comments

Comments
 (0)