Merge pull request #18 from linuxserver/3.7

bump to alpine 3.7 and fix continuation lines
This commit is contained in:
sparklyballs 2017-12-16 18:22:38 +00:00 committed by GitHub
commit 79e0dab58a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions

View File

@ -1,26 +1,25 @@
FROM lsiobase/alpine:3.6
MAINTAINER sparklyballs
FROM lsiobase/alpine:3.7
# set version label
ARG BUILD_DATE
ARG VERSION
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="sparklyballs"
# environment settings
ARG SYNC_SRC="/tmp/syncthing"
ARG SYNC_BUILD="$SYNC_SRC/src/github.com/syncthing/syncthing"
ENV HOME="/config"
# install build packages
RUN \
echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \
curl \
g++ \
gcc \
go \
tar && \
# compile syncthing
echo "**** compile syncthing ****" && \
mkdir -p \
"${SYNC_BUILD}" && \
export GOPATH="${SYNC_SRC}" && \
@ -34,8 +33,7 @@ RUN \
"${SYNC_BUILD}" --strip-components=1 && \
cd "${SYNC_BUILD}" && \
go run build.go -no-upgrade -version=${SYNC_TAG} && \
# install syncthing
echo "**** install syncthing ****" && \
install -d -o abc -g abc \
/var/lib/syncthing && \
install -D -m755 \
@ -47,8 +45,7 @@ RUN \
fi; \
done && \
export GOPATH="" && \
# cleanup
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
rm -rf \

View File

@ -85,6 +85,7 @@ You can find some of the best documentation available on the web at [docs.syncth
## Versions
+ **13.12.17:** Rebase to alpine 3.7.
+ **25.10.17:** Add env for manual setting of umask.
+ **29.07.17:** Simplify build structure as symlinks failing on > 0.14.32
+ **28.05.17:** Rebase to alpine 3.6.