Skip to content

Commit 8c3fdea

Browse files
committed
adding pipeline logic and multi arching
1 parent 8174dee commit 8c3fdea

File tree

7 files changed

+849
-8
lines changed

7 files changed

+849
-8
lines changed

Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM lsiobase/ubuntu:bionic
33
# set version label
44
ARG BUILD_DATE
55
ARG VERSION
6+
ARG MARIADB_VERSION
67
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
78
LABEL maintainer="sparklyballs"
89

@@ -24,9 +25,14 @@ RUN \
2425
echo "deb-src http://mirror.sax.uk.as61049.net/mariadb/repo/10.3/ubuntu bionic main" >> \
2526
/etc/apt/sources.list.d/mariadb.list && \
2627
echo "**** install runtime packages ****" && \
28+
if [ -z ${MARIADB_VERSION+x} ]; then \
29+
MARIADB="mariadb-server"; \
30+
else \
31+
MARIADB="mariadb-server=${MARIADB_VERSION}"; \
32+
fi && \
2733
apt-get update && \
2834
apt-get install -y \
29-
mariadb-server && \
35+
${MARIADB} && \
3036
echo "**** cleanup ****" && \
3137
rm -rf \
3238
/tmp/* \

Dockerfile.aarch64

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
FROM lsiobase/ubuntu.arm64:bionic
2+
3+
# Add qemu to build on x86_64 systems
4+
COPY qemu-aarch64-static /usr/bin
5+
6+
# set version label
7+
ARG BUILD_DATE
8+
ARG VERSION
9+
ARG MARIADB_VERSION
10+
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
11+
LABEL maintainer="sparklyballs"
12+
13+
# environment variables
14+
ARG DEBIAN_FRONTEND="noninteractive"
15+
ENV MYSQL_DIR="/config"
16+
ENV DATADIR=$MYSQL_DIR/databases
17+
18+
RUN \
19+
echo "**** install gnupg ****" && \
20+
apt-get update && \
21+
apt-get install -y \
22+
gnupg && \
23+
echo "add mariadb repository ****" && \
24+
echo "(redundant on armhf platform, but added for consistent dockerfile on all platforms) ****" && \
25+
apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 && \
26+
echo "deb http://mirror.sax.uk.as61049.net/mariadb/repo/10.3/ubuntu bionic main" >> \
27+
/etc/apt/sources.list.d/mariadb.list && \
28+
echo "deb-src http://mirror.sax.uk.as61049.net/mariadb/repo/10.3/ubuntu bionic main" >> \
29+
/etc/apt/sources.list.d/mariadb.list && \
30+
echo "**** install runtime packages ****" && \
31+
if [ -z ${MARIADB_VERSION+x} ]; then \
32+
MARIADB="mariadb-server"; \
33+
else \
34+
MARIADB="mariadb-server=${MARIADB_VERSION}"; \
35+
fi && \
36+
apt-get update && \
37+
apt-get install -y \
38+
${MARIADB} && \
39+
echo "**** cleanup ****" && \
40+
rm -rf \
41+
/tmp/* \
42+
/var/lib/apt/lists/* \
43+
/var/lib/mysql \
44+
/var/tmp/* && \
45+
mkdir -p \
46+
/var/lib/mysql
47+
48+
# add local files
49+
COPY root/ /
50+
51+
# ports and volumes
52+
EXPOSE 3306
53+
VOLUME /config

Dockerfile.armhf

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
FROM lsiobase/ubuntu.armhf:bionic
2+
3+
# Add qemu to build on x86_64 systems
4+
COPY qemu-arm-static /usr/bin
5+
6+
# set version label
7+
ARG BUILD_DATE
8+
ARG VERSION
9+
ARG MARIADB_VERSION
10+
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
11+
LABEL maintainer="sparklyballs"
12+
13+
# environment variables
14+
ARG DEBIAN_FRONTEND="noninteractive"
15+
ENV MYSQL_DIR="/config"
16+
ENV DATADIR=$MYSQL_DIR/databases
17+
18+
RUN \
19+
echo "**** install gnupg ****" && \
20+
apt-get update && \
21+
apt-get install -y \
22+
gnupg && \
23+
echo "add mariadb repository ****" && \
24+
echo "(redundant on armhf platform, but added for consistent dockerfile on all platforms) ****" && \
25+
apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 && \
26+
echo "deb http://mirror.sax.uk.as61049.net/mariadb/repo/10.3/ubuntu bionic main" >> \
27+
/etc/apt/sources.list.d/mariadb.list && \
28+
echo "deb-src http://mirror.sax.uk.as61049.net/mariadb/repo/10.3/ubuntu bionic main" >> \
29+
/etc/apt/sources.list.d/mariadb.list && \
30+
echo "**** install runtime packages ****" && \
31+
if [ -z ${MARIADB_VERSION+x} ]; then \
32+
MARIADB="mariadb-server"; \
33+
else \
34+
MARIADB="mariadb-server=${MARIADB_VERSION}"; \
35+
fi && \
36+
apt-get update && \
37+
apt-get install -y \
38+
${MARIADB} && \
39+
echo "**** cleanup ****" && \
40+
rm -rf \
41+
/tmp/* \
42+
/var/lib/apt/lists/* \
43+
/var/lib/mysql \
44+
/var/tmp/* && \
45+
mkdir -p \
46+
/var/lib/mysql
47+
48+
# add local files
49+
COPY root/ /
50+
51+
# ports and volumes
52+
EXPOSE 3306
53+
VOLUME /config

0 commit comments

Comments
 (0)