Skip to content

Commit

Permalink
Merge pull request #7 from linuxserver/3.7
Browse files Browse the repository at this point in the history
bump to alpine 3.7 and fix continuation lines
  • Loading branch information
sparklyballs authored Dec 17, 2017
2 parents 0ff9801 + 23009a3 commit 95823be
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
FROM lsiobase/alpine:3.6
MAINTAINER aptalca
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="aptalca"

# environment settings
ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2

# install packages
RUN \
echo "**** install packages ****" && \
apk add --no-cache \
curl

Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ If you'd like the output in a file, set the optional parameter LOG_FILE to true

## Versions

+ **28.05.2017:** Rebase to alpine 3.6.
+ **09.02.2017:** Rebase to alpine 3.5.
+ **17.11.2016:** Initial release
+ **08.12.17:** Rebase to alpine 3.7.
+ **28.05.17:** Rebase to alpine 3.6.
+ **09.02.17:** Rebase to alpine 3.5.
+ **17.11.16:** Initial release

0 comments on commit 95823be

Please sign in to comment.