Skip to content

Commit 79e0dab

Browse files
authored
Merge pull request #18 from linuxserver/3.7
bump to alpine 3.7 and fix continuation lines
2 parents 77e89da + 89e1921 commit 79e0dab

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

Dockerfile

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
1-
FROM lsiobase/alpine:3.6
2-
MAINTAINER sparklyballs
1+
FROM lsiobase/alpine:3.7
32

43
# set version label
54
ARG BUILD_DATE
65
ARG VERSION
76
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
7+
LABEL maintainer="sparklyballs"
88

99
# environment settings
1010
ARG SYNC_SRC="/tmp/syncthing"
1111
ARG SYNC_BUILD="$SYNC_SRC/src/github.com/syncthing/syncthing"
1212
ENV HOME="/config"
1313

14-
# install build packages
1514
RUN \
15+
echo "**** install build packages ****" && \
1616
apk add --no-cache --virtual=build-dependencies \
1717
curl \
1818
g++ \
1919
gcc \
2020
go \
2121
tar && \
22-
23-
# compile syncthing
22+
echo "**** compile syncthing ****" && \
2423
mkdir -p \
2524
"${SYNC_BUILD}" && \
2625
export GOPATH="${SYNC_SRC}" && \
@@ -34,8 +33,7 @@ RUN \
3433
"${SYNC_BUILD}" --strip-components=1 && \
3534
cd "${SYNC_BUILD}" && \
3635
go run build.go -no-upgrade -version=${SYNC_TAG} && \
37-
38-
# install syncthing
36+
echo "**** install syncthing ****" && \
3937
install -d -o abc -g abc \
4038
/var/lib/syncthing && \
4139
install -D -m755 \
@@ -47,8 +45,7 @@ RUN \
4745
fi; \
4846
done && \
4947
export GOPATH="" && \
50-
51-
# cleanup
48+
echo "**** cleanup ****" && \
5249
apk del --purge \
5350
build-dependencies && \
5451
rm -rf \

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ You can find some of the best documentation available on the web at [docs.syncth
8585

8686
## Versions
8787

88+
+ **13.12.17:** Rebase to alpine 3.7.
8889
+ **25.10.17:** Add env for manual setting of umask.
8990
+ **29.07.17:** Simplify build structure as symlinks failing on > 0.14.32
9091
+ **28.05.17:** Rebase to alpine 3.6.

0 commit comments

Comments
 (0)