diff --git a/Dockerfile b/Dockerfile index c6d0a8b..170d780 100755 --- a/Dockerfile +++ b/Dockerfile @@ -4,46 +4,47 @@ MAINTAINER sparklyballs # set version for s6 overlay ARG OVERLAY_VERSION="v1.18.1.5" ARG OVERLAY_ARCH="amd64" -ARG OVERLAY_URL="https://github.com/just-containers/s6-overlay/releases/download" -ARG OVERLAY_WWW="${OVERLAY_URL}"/"${OVERLAY_VERSION}"/s6-overlay-"${OVERLAY_ARCH}".tar.gz -# set some environment variables +# environment variables ENV PS1="$(whoami)@$(hostname):$(pwd)$ " \ HOME="/root" \ TERM="xterm" -# add packages +# install packages RUN \ apk add --no-cache --virtual=build-dependencies \ curl \ tar && \ - apk add --no-cache \ bash \ tzdata && \ - -apk add --no-cache --repository http://nl.alpinelinux.org/alpine/edge/community \ + apk add --no-cache \ + --repository http://nl.alpinelinux.org/alpine/edge/community \ shadow && \ # add s6 overlay curl -o \ /tmp/s6-overlay.tar.gz -L \ - "${OVERLAY_WWW}" && \ - tar xvfz /tmp/s6-overlay.tar.gz -C / && \ + "https://github.com/just-containers/s6-overlay/releases/download/${OVERLAY_VERSION}/s6-overlay-${OVERLAY_ARCH}.tar.gz" && \ + tar xfz \ + /tmp/s6-overlay.tar.gz -C / && \ + +# create abc user + groupmod -g 1000 users && \ + useradd -u 911 -U -d /config -s /bin/false abc && \ + usermod -G users abc && \ + +# make our folders + mkdir -p \ + /app \ + /config \ + /defaults && \ # clean up apk del --purge \ build-dependencies && \ - rm -rf /var/cache/apk/* /tmp/* - -# create abc user -RUN \ - groupmod -g 1000 users && \ - useradd -u 911 -U -d /config -s /bin/false abc && \ - usermod -G users abc && \ - -# create some folders - mkdir -p /config /app /defaults + rm -rf \ + /tmp/* # add local files COPY root/ / diff --git a/README.md b/README.md index 32d4d2d..15b4c51 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,16 @@ -![https://linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png) +[linuxserverurl]: https://linuxserver.io +[forumurl]: https://forum.linuxserver.io +[ircurl]: https://www.linuxserver.io/irc/ +[podcasturl]: https://www.linuxserver.io/podcast/ + +[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] [Dockerfile](https://github.com/linuxserver/docker-baseimage-alpine/blob/master/Dockerfile) ### This base container is not aimed at public consumption. It exists to serve as a single endpoint for LinuxServer.io containers and is based upon [Alpine Linux](https://hub.docker.com/_/alpine/) and [S6 overlay](https://github.com/just-containers/s6-overlay). -If you want to comment\contribute to our work, feel free to join us at out irc channel: -[IRC](https://www.linuxserver.io/index.php/irc/) on freenode at `#linuxserver.io` or visit our website at [https://linuxserver.io](https://linuxserver.io). +If you want to comment\contribute to this image, are looking for support on any of our other work , or are curious about us in general, check out the following. + +* [forum.linuxserver.io][forumurl] +* [IRC][ircurl] on freenode at `#linuxserver.io` +* [Podcast][podcasturl] covers everything to do with getting the most from your Linux Server plus a focus on all things Docker and containerisation!