SYS-318 release 18.06 version number refresh

instantlinux · instantlinux · commit 9325df18f2e5 · 2018-06-05T15:32:47.000-07:00
diff --git a/images/dhcpd-dns-pxe/Dockerfile b/images/dhcpd-dns-pxe/Dockerfile
@@ -8,6 +8,8 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
     org.label-schema.vcs-ref=$VCS_REF \
     org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools
 
+ARG DHCP_VERSION=4.3.5-r0
+
 ENV DHCP_BOOT=pxelinux.0 \
     DHCP_ENABLE=yes \
     DHCP_LEASE_PATH=/var/lib/misc \
@@ -32,7 +34,7 @@ ENV DHCP_BOOT=pxelinux.0 \
     TFTP_SERVER=self \
     TZ=UTC
 
-RUN apk add --no-cache --update dhcp dnsmasq
+RUN apk add --no-cache --update dhcp=$DHCP_VERSION dnsmasq
 
 EXPOSE 53/udp 67/udp 69/udp
 VOLUME $DHCP_LEASE_PATH $TFTP_ROOT /etc/dhcpd.d/local /etc/dnsmasq.d/local
diff --git a/images/dhcpd-dns-pxe/hooks/post_push b/images/dhcpd-dns-pxe/hooks/post_push
@@ -0,0 +1,4 @@
+#!/bin/bash
+TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2)
+docker tag $IMAGE_NAME $DOCKER_REPO:$TAG
+docker push $DOCKER_REPO:$TAG
diff --git a/images/dovecot/Dockerfile b/images/dovecot/Dockerfile
@@ -8,9 +8,11 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
     org.label-schema.vcs-ref=$VCS_REF \
     org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools
 
+ARG DOVECOT_VERSION=2.2.34-r0
 ENV LDAP_PASSWD_SECRET=ldap-ro-password
 
-RUN apk add --no-cache dovecot dovecot-ldap procmail
+RUN apk add --no-cache dovecot=$DOVECOT_VERSION dovecot-ldap=$DOVECOT_VERSION \
+    procmail
 EXPOSE 143 993 
 VOLUME /etc/dovecot/conf.local /home /var/spool/mail
 
diff --git a/images/dovecot/docker-compose.yml b/images/dovecot/docker-compose.yml
@@ -22,7 +22,7 @@ services:
     deploy:
       placement:
         constraints:
-        - node.labels.swarm-sync-member == true
+        - node.labels.mail-sync-member == true
     logging:
       driver: json-file
       options:
diff --git a/images/dovecot/entrypoint-dovecot.sh b/images/dovecot/entrypoint-dovecot.sh
@@ -16,6 +16,9 @@ if [ -s $ETC/conf.local/dovecot-ldap.conf ]; then
   sed -i -e "s/PASSWORD/`cat /run/secrets/$LDAP_PASSWD_SECRET`/" \
     $ETC/dovecot-ldap.conf
 fi
+if [ -f /etc/postfix/transport ]; then
+  postmap /etc/postfix/transport
+fi
 mkdir -p -m 700 /etc/ssl/private
 cp /run/secrets/*key.pem /etc/ssl/private
 
diff --git a/images/dovecot/hooks/post_push b/images/dovecot/hooks/post_push
@@ -0,0 +1,4 @@
+#!/bin/bash
+TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2)
+docker tag $IMAGE_NAME $DOCKER_REPO:$TAG
+docker push $DOCKER_REPO:$TAG
diff --git a/images/duplicati/hooks/post_push b/images/duplicati/hooks/post_push
@@ -0,0 +1,4 @@
+#!/bin/bash
+TAG=$(grep "ARG DUPLICATI_VERSION" Dockerfile | cut -d= -f 2)
+docker tag $IMAGE_NAME $DOCKER_REPO:$TAG
+docker push $DOCKER_REPO:$TAG
diff --git a/images/ez-ipupdate/Dockerfile b/images/ez-ipupdate/Dockerfile
@@ -8,13 +8,14 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
     org.label-schema.vcs-ref=$VCS_REF \
     org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools
 
+ARG EZ_VERSION=3.0.10-r9
 ENV HOST=must_be_set \
     INTERVAL=3600 \
     IPLOOKUP_URI=http://ipinfo.io/ip \
     SERVICE_TYPE=easydns \
     USER_SECRET=ez-ipupdate-user
 
-RUN apk add --update curl ez-ipupdate && \
+RUN apk add --update curl ez-ipupdate=$EZ_VERSION && \
     rm -fr /var/log/* /var/cache/apk/*
 
 CMD sh -c 'echo "user=`cat /run/secrets/$USER_SECRET`" > /run/ez.conf && \
diff --git a/images/ez-ipupdate/hooks/post_push b/images/ez-ipupdate/hooks/post_push
@@ -0,0 +1,4 @@
+#!/bin/bash
+TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2)
+docker tag $IMAGE_NAME $DOCKER_REPO:$TAG
+docker push $DOCKER_REPO:$TAG
diff --git a/images/git-dump/Dockerfile b/images/git-dump/Dockerfile
@@ -19,12 +19,13 @@ ENV API_TOKEN_SECRET= \
     USERNAME=git-dump \
     TZ=UTC
 
-ARG UID=212
+ARG GIT_VERSION=2.15.0-r1
 ARG GROUP=care
 ARG GID=505
+ARG UID=212
 
 COPY *.sh /usr/local/bin/
-RUN apk add --no-cache --update curl dcron git jq openssh-client && \
+RUN apk add --no-cache --update curl dcron git=$GIT_VERSION jq openssh-client && \
     addgroup -g $GID $GROUP && \
     adduser -u $UID -s /bin/sh -G $GROUP -g "git backup" -D $USERNAME && \
     chmod o+rx,g+rx /usr/local/bin/*.sh
diff --git a/images/git-dump/docker-compose.yml b/images/git-dump/docker-compose.yml
@@ -34,5 +34,5 @@ networks:
 secrets:
   git-dump_sshkey:
     external: true
-  git.${MYDOMAIN}-api-token:
+  git.instantlinux.net-api-token:
     external: true
diff --git a/images/git-dump/hooks/post_push b/images/git-dump/hooks/post_push
@@ -0,0 +1,4 @@
+#!/bin/bash
+TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2)
+docker tag $IMAGE_NAME $DOCKER_REPO:$TAG
+docker push $DOCKER_REPO:$TAG
diff --git a/images/git-pull/Dockerfile b/images/git-pull/Dockerfile
@@ -8,13 +8,14 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
     org.label-schema.vcs-ref=$VCS_REF \
     org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools
 
+ARG GIT_VERSION=2.15.0-r1
 ENV DEST=. \
     GIT_COMMIT=master \
     GIT_HOST=github.com \
     GIT_REPO=uri \
     INTERVAL=0
 
-RUN apk add --no-cache --update git openssh-client
+RUN apk add --no-cache --update git=$GIT_VERSION openssh-client
 
 VOLUME /git
 
diff --git a/images/jenkins-master/hooks/post_push b/images/jenkins-master/hooks/post_push
@@ -0,0 +1,4 @@
+#!/bin/bash
+TAG=$(grep "ARG _JENKINS_VERSION" Dockerfile | cut -d= -f 2)
+docker tag $IMAGE_NAME $DOCKER_REPO:$TAG
+docker push $DOCKER_REPO:$TAG
diff --git a/images/mythtv-backend/hooks/post_push b/images/mythtv-backend/hooks/post_push
@@ -0,0 +1,4 @@
+#!/bin/bash
+TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2)
+docker tag $IMAGE_NAME $DOCKER_REPO:$TAG
+docker push $DOCKER_REPO:$TAG
diff --git a/images/nut-upsd/Dockerfile b/images/nut-upsd/Dockerfile
@@ -8,6 +8,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
     org.label-schema.vcs-ref=$VCS_REF \
     org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools
 
+ARG NUT_VERSION=2.7.4-r5
 ENV API_USER=upsmon \
     DESCRIPTION=UPS \
     DRIVER=usbhid-ups \
@@ -19,9 +20,12 @@ ENV API_USER=upsmon \
     SERVER=master \
     USER=nut
 
-RUN echo '@testing http://nl.alpinelinux.org/alpine/edge/testing' \
+RUN echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/main' \
       >>/etc/apk/repositories && \
-    apk add --update nut@testing
+    echo '@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing' \
+      >>/etc/apk/repositories && \
+    apk add --update nut@testing=$NUT_VERSION \
+      libressl2.7-libcrypto@edge libressl2.7-libssl@edge
 
 EXPOSE 3493
 COPY entrypoint.sh /usr/local/bin/
diff --git a/images/nut-upsd/hooks/post_push b/images/nut-upsd/hooks/post_push
@@ -0,0 +1,4 @@
+#!/bin/bash
+TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2)
+docker tag $IMAGE_NAME $DOCKER_REPO:$TAG
+docker push $DOCKER_REPO:$TAG
diff --git a/images/open-xchange-appsuite/hooks/post_push b/images/open-xchange-appsuite/hooks/post_push
@@ -0,0 +1,4 @@
+#!/bin/bash
+TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2)
+docker tag $IMAGE_NAME $DOCKER_REPO:$TAG
+docker push $DOCKER_REPO:$TAG
diff --git a/images/postfix/Dockerfile b/images/postfix/Dockerfile
@@ -8,10 +8,11 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
     org.label-schema.vcs-ref=$VCS_REF \
     org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools
 
+ARG POSTFIX_VERSION=3.2.4-r1
 ENV SASL_PASSWD_SECRET=postfix-sasl-passwd \
     TZ=US/Pacific
 
-RUN apk add --no-cache postfix rsyslog spamassassin-client
+RUN apk add --no-cache postfix=$POSTFIX_VERSION rsyslog spamassassin-client
 
 EXPOSE 25 3525
 
diff --git a/images/postfix/hooks/post_push b/images/postfix/hooks/post_push
@@ -0,0 +1,4 @@
+#!/bin/bash
+TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2)
+docker tag $IMAGE_NAME $DOCKER_REPO:$TAG
+docker push $DOCKER_REPO:$TAG
diff --git a/images/proftpd/Dockerfile b/images/proftpd/Dockerfile
@@ -8,6 +8,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
     org.label-schema.vcs-ref=$VCS_REF \
     org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools
 
+ARG PROFTPD_VERSION=1.3.6-r5
 ENV ALLOW_OVERWRITE=on \
     ANONYMOUS_DISABLE=off \
     ANON_UPLOAD_ENABLE=DenyAll \
@@ -25,9 +26,11 @@ ENV ALLOW_OVERWRITE=on \
     TZ=UTC \
     WRITE_ENABLE=AllowAll
 
-RUN echo '@testing http://nl.alpinelinux.org/alpine/edge/testing' \
+RUN echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/main' \
       >>/etc/apk/repositories && \
-    apk add --update proftpd@testing tzdata
+    echo '@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing' \
+      >>/etc/apk/repositories && \
+    apk add --update libressl2.7-libcrypto@edge proftpd@testing=$PROFTPD_VERSION tzdata
 COPY proftpd.conf.j2 /etc/proftpd/proftpd.conf
 
 VOLUME /etc/proftpd/conf.d /etc/proftpd/modules.d /var/lib/ftp
diff --git a/images/proftpd/hooks/post_push b/images/proftpd/hooks/post_push
@@ -0,0 +1,4 @@
+#!/bin/bash
+TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2)
+docker tag $IMAGE_NAME $DOCKER_REPO:$TAG
+docker push $DOCKER_REPO:$TAG
diff --git a/images/rsyslogd/Dockerfile b/images/rsyslogd/Dockerfile
@@ -8,8 +8,10 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
     org.label-schema.vcs-ref=$VCS_REF \
     org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools
 
+ARG RSYSLOG_VERSION=8.31.0-r0
 ENV TZ=US/Pacific
-RUN apk add --update gzip logrotate rsyslog rsyslog-mysql tar xz && \
+RUN apk add --update gzip logrotate rsyslog=$RSYSLOG_VERSION \
+      rsyslog-mysql=$RSYSLOG_VERSION tar xz && \
     rm -fr /var/log/* /var/cache/apk/*
 
 VOLUME /var/log /etc/logrotate.d /etc/rsyslog.d
diff --git a/images/rsyslogd/hooks/post_push b/images/rsyslogd/hooks/post_push
@@ -0,0 +1,4 @@
+#!/bin/bash
+TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2)
+docker tag $IMAGE_NAME $DOCKER_REPO:$TAG
+docker push $DOCKER_REPO:$TAG
diff --git a/images/samba-dc/Dockerfile b/images/samba-dc/Dockerfile
@@ -26,8 +26,9 @@ ENV ADMIN_PASSWORD_SECRET=samba-admin-password \
 
 ARG BIND9_VER=9.11.2
 ARG BIND9_SHA=7f46ad8620f7c3b0ac375d7a5211b15677708fda84ce25d7aeb7222fe2e3c77a
+ARG SAMBA_VERSION=4.7.6-r0
 
-RUN apk add --update --no-cache krb5 ldb-tools samba-dc tdb \
+RUN apk add --update --no-cache krb5 ldb-tools samba-dc=$SAMBA_VERSION tdb \
       libxml2 libcrypto1.0 && \
 
 # The bind-tools package on Alpine omits gssapi, so build it here.
diff --git a/images/samba-dc/hooks/post_push b/images/samba-dc/hooks/post_push
@@ -0,0 +1,4 @@
+#!/bin/bash
+TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2)
+docker tag $IMAGE_NAME $DOCKER_REPO:$TAG
+docker push $DOCKER_REPO:$TAG
diff --git a/images/samba/Dockerfile b/images/samba/Dockerfile
@@ -8,14 +8,15 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
     org.label-schema.vcs-ref=$VCS_REF \
     org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools
 
+ARG SAMBA_VERSION=4.7.6-r0
 ENV DOMAIN_LOGONS=no \
     LOGON_DRIVE=H \
     NETBIOS_NAME=samba \
     SERVER_STRING="Samba Server" \
     TZ=UTC \
     WORKGROUP=WORKGROUP
 
-RUN apk add --update --no-cache samba shadow
+RUN apk add --update --no-cache samba=$SAMBA_VERSION shadow
 
 VOLUME /etc/samba/conf.d /var/log/samba
 EXPOSE 137-138/udp 139 445
diff --git a/images/samba/hooks/post_push b/images/samba/hooks/post_push
@@ -0,0 +1,4 @@
+#!/bin/bash
+TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2)
+docker tag $IMAGE_NAME $DOCKER_REPO:$TAG
+docker push $DOCKER_REPO:$TAG
diff --git a/images/swarm-sync/Makefile b/images/swarm-sync/Makefile
@@ -26,8 +26,10 @@ $(HOME)/.docker/$(KEY_NAME).pub.env:
 label_nodes:
 	@docker node update --label-add swarm-sync=primary $(PRIMARY)
 	@docker node update --label-add swarm-sync-member=true $(PRIMARY)
+	@docker node update --label-add mail-sync-member=true $(PRIMARY)
 	@docker node update --label-add swarm-sync=peer $(PEER)
 	@docker node update --label-add swarm-sync-member=true $(PEER)
+	@docker node update --label-add mail-sync-member=true $(PRIMARY)
 	@echo "Nodes labeled, use node.labels.swarm-sync-member == true"
 
 nagios_nrpe:
diff --git a/images/swarm-sync/docker-compose.yml b/images/swarm-sync/docker-compose.yml
@@ -9,7 +9,7 @@ services:
     image: ${REGISTRY_URI:-instantlinux}/swarm-sync:${VERSION_SWARMSYNC:-latest}
     environment:
       SYNC_INTERVAL: "2"
-      TZ: ${TZ:-GMT]
+      TZ: ${TZ:-UTC}
     volumes:
     - logs:/var/log/unison
     - syncarchive:/root/.unison
diff --git a/images/vsftpd/Dockerfile b/images/vsftpd/Dockerfile
@@ -8,6 +8,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
     org.label-schema.vcs-ref=$VCS_REF \
     org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools
 
+ARG VSFTPD_VERSION=3.0.3-r4
 ENV ANONYMOUS_ENABLE=YES \
     ANON_MKDIR_WRITE_ENABLE=NO \
     ANON_UPLOAD_ENABLE=NO \
@@ -24,7 +25,7 @@ ENV ANONYMOUS_ENABLE=YES \
     VSFTPD_LOG_FILE=/dev/stdout \
     WRITE_ENABLE=YES
 
-RUN apk add --update --no-cache tzdata vsftpd && \
+RUN apk add --update --no-cache tzdata vsftpd=$VSFTPD_VERSION && \
     passwd -l root
 
 VOLUME /etc/vsftpd.d /var/lib/ftp
diff --git a/images/vsftpd/hooks/post_push b/images/vsftpd/hooks/post_push
@@ -0,0 +1,4 @@
+#!/bin/bash
+TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2)
+docker tag $IMAGE_NAME $DOCKER_REPO:$TAG
+docker push $DOCKER_REPO:$TAG
diff --git a/stacks/Makefile b/stacks/Makefile
@@ -3,6 +3,7 @@ STACKS = $(basename $(wildcard *.yml))
 DEPLOY = $(STACKS:%=.deploy/%)
 
 db00: CLUSTER_NAME = db00
+db02: CLUSTER_NAME = db02
 
 default: $(DEPLOY)
 
@@ -21,6 +22,7 @@ cloud: .deploy/cloud
 crashplan: .deploy/crashplan
 davite: .deploy/davite
 db00: .deploy/db00
+db02: .deploy/db02
 docs: .deploy/docs
 dovecot: .deploy/dovecot
 dropbox: .deploy/dropbox
@@ -53,7 +55,6 @@ www00: .deploy/www00
 wwwext: .deploy/wwwext
 wx-nginx: .deploy/wx-nginx
 wxcam-upload: .deploy/wxcam-upload
-vsftpd: .deploy/vsftpd
 
 net_create::
 	docker network create dbcluster --driver overlay $(LABELS)
diff --git a/stacks/db00.yml b/stacks/db00.yml
@@ -26,7 +26,7 @@ services:
       restart_policy:
         condition: any
         delay: 20s
-        max_attempts: 20
+        max_attempts: 30
 
 volumes:
   data:
diff --git a/stacks/db02.yml b/stacks/db02.yml
@@ -0,0 +1,44 @@
+version: "3.2"
+
+services:
+  peer:
+    hostname: "{{.Service.Name}}-{{.Task.Slot}}"
+    image: ${REGISTRY_URI:-instantlinux}/mariadb-galera:${VERSION_MARIADB:-latest}
+    environment:
+      CLUSTER_NAME: ${CLUSTER_NAME:-cluster01}
+      DISCOVERY_SERVICE: ${ETCD_HOST:-etcd}:2379
+      CLUSTER_SIZE: 3
+    ports:
+    - target: 3306
+      published: 18306
+      protocol: tcp
+      mode: host
+    volumes:
+    - data:/var/lib/mysql
+    - logs:/var/log/mysql
+    - ${ADMIN_PATH:-/opt}/mariadb/etc/:/etc/mysql/my.cnf.d:ro
+    secrets:
+    - mysql-root-password
+    deploy:
+      mode: global
+      labels:
+      - ${LABEL:-service_type=mariadb}
+      restart_policy:
+        condition: any
+        delay: 20s
+        max_attempts: 20
+
+volumes:
+  data:
+    labels:
+     - ${LABEL:-service_type=mariadb}
+  logs:
+    labels:
+     - ${LABEL:-service_type=mariadb}
+  db_etc:
+    external: true
+networks:
+  default:
+secrets:
+  mysql-root-password:
+    external: true
