Simpler Dockerfiles

- leverage the upstream packages for debian
- for alpine, us the aports
- simplify update.sh

.travis.yml

@@ -2,20 +2,18 @@ language: bash
 services: docker
 
 env:
-  - VERSION=6.2 VARIANT=stretch
-  - VERSION=6.2 VARIANT=alpine3.8
-  - VERSION=6.0 VARIANT=stretch
-  - VERSION=6.0 VARIANT=alpine3.8
-  - VERSION=4.1 VARIANT=stretch
-  - VERSION=4.1 VARIANT=alpine3.8
+  - VERSION=6.0 DIST=debian REL=stretch
+  - VERSION=6.0 DIST=alpine REL=3.8
+  - VERSION=6.2 DIST=debian REL=stretch
+  - VERSION=6.2 DIST=alpine REL=3.8
 
 install:
   - git clone https://github.com/docker-library/official-images.git ~/official-images
 
 before_script:
   - env | sort
-  - cd "$VERSION/$VARIANT"
-  - image="varnish:${VERSION}-${VARIANT}"
+  - cd "$VERSION/${DIST}/${REL}"
+  - image="varnish:${VERSION}-${DIST}-${REL}"
 
 script:
   - travis_retry docker build -t "$image" .

6.0/alpine/3.8/Dockerfile

@@ -0,0 +1,34 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+FROM alpine:3.8
+
+RUN apk add git alpine-sdk && \
+	    adduser -D builder && \
+	    addgroup builder abuild && \
+	    chgrp abuild /var/cache/distfiles && \
+	    su builder -c "abuild-keygen -na" && \
+	    chmod g+w /var/cache/distfiles && \
+	    su builder -c "git clone https://git.alpinelinux.org/aports /tmp/aports" && \
+	    cd /tmp/aports/main/varnish && \
+	    su builder -c "abuild checksum && abuild -r" && \
+	    apk add ~builder/packages/main/x86_64/*.apk --allow-untrusted
+
+WORKDIR /usr/local/var/varnish
+RUN chown -R varnish:varnish /usr/local/var/varnish
+VOLUME /usr/local/var/varnish
+
+COPY docker-varnish-entrypoint /usr/local/bin/
+ENTRYPOINT ["docker-varnish-entrypoint"]
+
+EXPOSE 80
+CMD ["varnishd", "-F", "-f", "/usr/local/etc/varnish/default.vcl"]