Merge pull request #27 from jdeathe/centos-6-develop

Release changes for 1.3.0

Dockerfile

@@ -1,68 +1,100 @@
 # =============================================================================
 # jdeathe/centos-ssh-varnish
 #
-# CentOS-6, Varnish 3.0
+# CentOS-6, Varnish 4.1
 #
-# BUILD: 
-#	docker build -t jdeathe/centos-ssh-varnish .
-# RUN:
-#	docker run -d --privileged --name varnish.pool-1.1.1 \
-#		-p 8000:80 -p 8500:8443 \
-#		jdeathe/centos-ssh-varnish:latest
-# ACCESS:
-#   docker exec -it varnish.pool-1.1.1 bash
-# ALTERNATIVE ACCESS:
-#	sudo /usr/bin/nsenter -m -u -i -n -p -t $(/usr/bin/docker inspect \
-#		--format '{{ .State.Pid }}' varnish.pool-1.1.1) /bin/bash
 # =============================================================================
-FROM jdeathe/centos-ssh:centos-6-1.4.0
+FROM jdeathe/centos-ssh:centos-6-1.7.3
 
 MAINTAINER James Deathe <james.deathe@gmail.com>
 
 # -----------------------------------------------------------------------------
 # Install Varnish Cache
 # -----------------------------------------------------------------------------
-RUN rpm --nosignature -Uvh http://repo.varnish-cache.org/redhat/varnish-3.0/el6/noarch/varnish-release/varnish-release-3.0-1.el6.noarch.rpm \
+RUN rpm --rebuilddb \
+	&& rpm --nosignature \
+		-i https://repo.varnish-cache.org/redhat/varnish-4.1.el6.rpm \
 	&& yum --setopt=tsflags=nodocs -y install \
-	varnish-3.0.7-1.el6 \
+		varnish-4.1.3-1.el6 \
 	&& yum versionlock add \
-	varnish* \
+		varnish* \
 	&& rm -rf /var/cache/yum/* \
 	&& yum clean all
 
 # -----------------------------------------------------------------------------
 # Copy files into place
 # -----------------------------------------------------------------------------
-ADD etc/varnish-start /etc/
-ADD etc/services-config/supervisor/supervisord.conf /etc/services-config/supervisor/
-ADD etc/services-config/varnish/docker-default.vcl /etc/services-config/varnish/
-ADD etc/services-config/varnish/docker-cluster.vcl /etc/services-config/varnish/
+ADD usr/sbin/varnishd-wrapper \
+	/usr/sbin/
+ADD opt/scmi \
+	/opt/scmi/
+ADD etc/services-config/supervisor/supervisord.d \
+	/etc/services-config/supervisor/supervisord.d/
+ADD etc/services-config/varnish/docker-default.vcl \
+	/etc/services-config/varnish/
+ADD etc/systemd/system \
+	/etc/systemd/system/
 
-RUN ln -sf /etc/services-config/supervisor/supervisord.conf /etc/supervisord.conf \
-	&& ln -sf /etc/services-config/varnish/docker-default.vcl /etc/varnish/docker-default.vcl \
-	&& ln -sf /etc/services-config/varnish/docker-cluster.vcl /etc/varnish/docker-cluster.vcl \
-	&& chmod +x /etc/varnish-start \
-	&& chmod 644 /etc/varnish/*.vcl
+RUN ln -sf \
+		/etc/services-config/supervisor/supervisord.d/varnishd-wrapper.conf \
+		/etc/supervisord.d/varnishd-wrapper.conf \
+	&& ln -sf \
+		/etc/services-config/varnish/docker-default.vcl \
+		/etc/varnish/docker-default.vcl \
+	&& chmod 644 \
+		/etc/varnish/*.vcl \
+	&& chmod 700 \
+		/usr/sbin/varnishd-wrapper
 
 EXPOSE 80 8443
 
 # -----------------------------------------------------------------------------
 # Set default environment variables
 # -----------------------------------------------------------------------------
-ENV MEMLOCK 82000
-ENV NFILES 131072
-ENV NPROCS "unlimited"
-ENV VARNISH_ADMIN_LISTEN_ADDRESS 127.0.0.1
-ENV VARNISH_ADMIN_LISTEN_PORT 6082
-ENV VARNISH_LISTEN_ADDRESS 0.0.0.0
-ENV VARNISH_LISTEN_PORT 80,0.0.0.0:8443
-ENV VARNISH_MAX_THREADS 1000
-ENV VARNISH_MIN_THREADS 50
-ENV VARNISH_PIDFILE /var/run/varnish.pid
-ENV VARNISH_SECRET_FILE /etc/varnish/secret
-ENV VARNISH_STORAGE file,/var/lib/varnish/varnish_storage.bin,1G
-ENV VARNISH_THREAD_TIMEOUT 120
-ENV VARNISH_TTL 120
-ENV VARNISH_VCL_CONF /etc/varnish/docker-default.vcl
+ENV SSH_AUTOSTART_SSHD=false \
+	SSH_AUTOSTART_SSHD_BOOTSTRAP=false \
+	VARNISH_ADMIN_LISTEN_ADDRESS="127.0.0.1" \
+	VARNISH_ADMIN_LISTEN_PORT="6082" \
+	VARNISH_LISTEN_ADDRESS="0.0.0.0" \
+	VARNISH_LISTEN_PORT="80 -a 0.0.0.0:8443" \
+	VARNISH_MAX_THREADS="1000" \
+	VARNISH_MIN_THREADS="50" \
+	VARNISH_PIDFILE="/var/run/varnish.pid" \
+	VARNISH_SECRET_FILE="/etc/varnish/secret" \
+	VARNISH_STORAGE="file,/var/lib/varnish/varnish_storage.bin,1G" \
+	VARNISH_THREAD_TIMEOUT="120" \
+	VARNISH_TTL="120" \
+	VARNISH_VCL_CONF="/etc/varnish/docker-default.vcl"
+
+# -----------------------------------------------------------------------------
+# Set image metadata
+# -----------------------------------------------------------------------------
+ARG RELEASE_VERSION="1.3.0"
+LABEL \
+	install="docker run \
+--rm \
+--privileged \
+--volume /:/media/root \
+jdeathe/centos-ssh-varnish:centos-6-${RELEASE_VERSION} \
+/usr/sbin/scmi install \
+--chroot=/media/root \
+--name=\${NAME} \
+--tag=centos-6-${RELEASE_VERSION}" \
+	uninstall="docker run \
+--rm \
+--privileged \
+--volume /:/media/root \
+jdeathe/centos-ssh-varnish:centos-6-${RELEASE_VERSION} \
+/usr/sbin/scmi uninstall \
+--chroot=/media/root \
+--name=\${NAME} \
+--tag=centos-6-${RELEASE_VERSION}" \
+	org.deathe.name="centos-ssh-varnish" \
+	org.deathe.version="${RELEASE_VERSION}" \
+	org.deathe.release="jdeathe/centos-ssh-varnish:centos-6-${RELEASE_VERSION}" \
+	org.deathe.license="MIT" \
+	org.deathe.vendor="jdeathe" \
+	org.deathe.url="https://github.com/jdeathe/centos-ssh-varnish" \
+	org.deathe.description="CentOS-6 6.8 x86_64 - Varnish Cache 4.1."
 
 CMD ["/usr/bin/supervisord", "--configuration=/etc/supervisord.conf"]