Merge remote-tracking branch 'upstream/master' into HEAD

.github/workflows/make-test.yml

@@ -0,0 +1,14 @@
+on:
+  push
+name: make test
+jobs:
+  test:
+    name: make test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+        with:
+          fetch-depth: '2'
+      - name: make test
+        run: make test
+        shell: bash

.travis.yml

@@ -1,8 +0,0 @@
----
-  sudo: required
-  notifications:
-    email: true
-  services:
-    - docker
-  script:
-    - make test

README.md

@@ -1,6 +1,6 @@
 ## dockerfiles
 
-[![Travis CI](https://img.shields.io/travis/jessfraz/dockerfiles.svg?style=for-the-badge)](https://travis-ci.org/jessfraz/dockerfiles)
+[![make test](https://github.com/jessfraz/dockerfiles/workflows/make%20test/badge.svg)](https://github.com/jessfraz/dockerfiles/actions?query=workflow%3A%22make+test%22+branch%3Amaster)
 
 This is a repo to hold various Dockerfiles for images I create.
 
@@ -48,4 +48,4 @@ latest-versions                Checks all the latest versions of the Dockerfile
 run                            Run a Dockerfile from the command at the top of the file (ex. DIR=telnet).
 shellcheck                     Runs the shellcheck tests on the scripts.
 test                           Runs the tests on the repository.
-```
+```

ansible/Dockerfile

@@ -7,12 +7,10 @@
 # 	-v ${HOME}/.ssh:/root/.ssh:ro \
 # 	ansible all -m ping
 #
-FROM alpine:latest
+FROM python:3-alpine
 LABEL maintainer "Christian Koep <christiankoep@gmail.com>"
 
 RUN builddeps=' \
-		python-dev \
-		py2-pip \
 		musl-dev \
 		openssl-dev \
 		libffi-dev \
@@ -20,16 +18,9 @@ RUN builddeps=' \
 		' \
 	&& apk --no-cache add \
 	ca-certificates \
-	python \
-	py-paramiko \
-	py-yaml \
-	py-jinja2 \
-	py-httplib2 \
 	$builddeps \
-	&& pip install --upgrade pip \
 	&& pip install \
 		ansible \
-		six \
 	&& apk del --purge $builddeps
 
 ENTRYPOINT [ "ansible" ]

aspell/Dockerfile

@@ -0,0 +1,8 @@
+FROM alpine:latest
+LABEL maintainer "Jessie Frazelle <jess@linux.com>"
+
+RUN apk add --no-cache \
+	aspell \
+	aspell-en
+
+ENTRYPOINT ["aspell"]

awscli/Dockerfile

@@ -1,3 +1,11 @@
+# Run awscli in a container and list s3 buckets
+#
+# docker run --rm -it \
+#	--name awscli \
+#	jess/awscli \
+#       s3 ls
+#
+
 FROM alpine:latest
 LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
@@ -5,9 +13,8 @@ RUN apk --no-cache add \
 	ca-certificates \
 	groff \
 	less \
-	python \
+	python3 \
-	py2-pip \
+	&& pip3 install awscli \
-	&& pip install awscli \
 	&& mkdir -p /root/.aws \
 	&& { \
 		echo '[default]'; \

bcc-tools/Dockerfile

@@ -38,7 +38,6 @@ RUN apt-get update && apt-get install -y \
 	libedit-dev \
 	clang-format \
 	python \
-	python-netaddr \
 	python3-pyroute2 \
 	luajit \
 	libluajit-5.1-dev \
@@ -52,7 +51,7 @@ RUN apt-get update && apt-get install -y \
     && rm -rf /var/lib/apt/lists/*
 
 # Build libbcc
-ENV BCC_VERSION v0.11.0
+ENV BCC_VERSION v0.14.0
 RUN git clone --depth 1 --branch "$BCC_VERSION" https://github.com/iovisor/bcc.git /usr/src/bcc \
 	&& ( \
 		cd /usr/src/bcc \

bpftrace/Dockerfile

@@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y \
     && rm -rf /var/lib/apt/lists/*
 
 # Build bpftrace
-ENV BPFTRACE_VERSION v0.9.3
+ENV BPFTRACE_VERSION v0.10.0
 RUN git clone --depth 1 --branch "$BPFTRACE_VERSION" https://github.com/iovisor/bpftrace.git /usr/src/bpftrace \
 	&& ( \
 		cd /usr/src/bpftrace \

brok/Dockerfile

@@ -0,0 +1,7 @@
+FROM haskell:8.8
+
+LABEL maintainer "Jessie Frazelle <jess@linux.com>"
+
+RUN cabal update && cabal install brok
+
+CMD ["brok"]

build-all.sh

@@ -32,7 +32,7 @@ build_and_push(){
 	done
 
 	# also push the tag latest for "stable" (chrome), "tools" (wireguard) or "3.5" tags for zookeeper
-	if [[ "$suite" == "stable" ]] || [[ "$suite" == "3.5" ]] || [[ "$suite" == "tools" ]]; then
+	if [[ "$suite" == "stable" ]] || [[ "$suite" == "3.6" ]] || [[ "$suite" == "tools" ]]; then
 		docker tag "${REPO_URL}/${base}:${suite}" "${REPO_URL}/${base}:latest"
 		docker push --disable-content-trust=false "${REPO_URL}/${base}:latest"
 	fi

buttslock/buttslock.sh

@@ -16,7 +16,7 @@ FONT=
 
 scrot /tmp/scrot.png
 convert /tmp/scrot.png \
-    -level 0%,100%,0.6 -blur $BLURTYPE $FONT \
+    -level 0%,100%,0.6 -blur "$BLURTYPE" "$FONT" \
     -pointsize 26 -fill white -gravity center \
     -annotate +0+200 'Type password to unlock' \
     /tmp/conv.png

certbot/Dockerfile

@@ -7,7 +7,7 @@ RUN apk --no-cache add \
 	libressl \
 	python3
 
-ENV CERTBOT_VERSION 1.0.0
+ENV CERTBOT_VERSION 1.5.0
 
 RUN buildDeps=' \
 		build-base \

cfssl/Dockerfile

@@ -9,7 +9,7 @@ RUN apk --no-cache add \
 		libc-dev
 
 
-ENV CFSSL_VERSION 1.4.1
+ENV CFSSL_VERSION v1.4.1
 
 RUN git clone --depth 1 --branch "$CFSSL_VERSION" https://github.com/cloudflare/cfssl.git /go/src/github.com/cloudflare/cfssl
 

chrome/beta/Dockerfile

@@ -19,7 +19,7 @@
 # 	wget https://raw.githubusercontent.com/jfrazelle/dotfiles/master/etc/docker/seccomp/chrome.json -O ~/chrome.json
 
 # Base docker image
-FROM debian:sid-slim
+FROM debian:bullseye-slim
 LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
 # Install Chrome
@@ -32,7 +32,7 @@ RUN apt-get update && apt-get install -y \
 	libcanberra-gtk* \
 	libgl1-mesa-dri \
 	libgl1-mesa-glx \
-	libpango1.0-0 \
+	libpangox-1.0-0 \
 	libpulse0 \
 	libv4l-0 \
 	fonts-symbola \
@@ -45,18 +45,6 @@ RUN apt-get update && apt-get install -y \
 	&& apt-get purge --auto-remove -y curl \
 	&& rm -rf /var/lib/apt/lists/*
 
-# Download the google-talkplugin
-RUN set -x \
-	&& apt-get update \
-	&& apt-get install -y --no-install-recommends \
-		ca-certificates \
-		curl \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& curl -sSL "https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb" -o /tmp/google-talkplugin-amd64.deb \
-	&& dpkg -i /tmp/google-talkplugin-amd64.deb \
-	&& rm -rf /tmp/*.deb \
-	&& apt-get purge -y --auto-remove curl
-
 # Add chrome user
 RUN groupadd -r chrome && useradd -r -g chrome -G audio,video chrome \
     && mkdir -p /home/chrome/Downloads && chown -R chrome:chrome /home/chrome

chrome/stable/Dockerfile

@@ -19,7 +19,7 @@
 # 	wget https://raw.githubusercontent.com/jfrazelle/dotfiles/master/etc/docker/seccomp/chrome.json -O ~/chrome.json
 
 # Base docker image
-FROM debian:sid-slim
+FROM debian:bullseye-slim
 LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
 # Install Chrome
@@ -32,7 +32,7 @@ RUN apt-get update && apt-get install -y \
 	libcanberra-gtk* \
 	libgl1-mesa-dri \
 	libgl1-mesa-glx \
-	libpango1.0-0 \
+	libpangox-1.0-0 \
 	libpulse0 \
 	libv4l-0 \
 	fonts-symbola \
@@ -45,18 +45,6 @@ RUN apt-get update && apt-get install -y \
 	&& apt-get purge --auto-remove -y curl \
 	&& rm -rf /var/lib/apt/lists/*
 
-# Download the google-talkplugin
-RUN set -x \
-	&& apt-get update \
-	&& apt-get install -y --no-install-recommends \
-		ca-certificates \
-		curl \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& curl -sSL "https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb" -o /tmp/google-talkplugin-amd64.deb \
-	&& dpkg -i /tmp/google-talkplugin-amd64.deb \
-	&& rm -rf /tmp/*.deb \
-	&& apt-get purge -y --auto-remove curl
-
 # Add chrome user
 RUN groupadd -r chrome && useradd -r -g chrome -G audio,video chrome \
     && mkdir -p /home/chrome/Downloads && chown -R chrome:chrome /home/chrome

chromium/Dockerfile

@@ -18,10 +18,11 @@
 # 	wget https://raw.githubusercontent.com/jfrazelle/dotfiles/master/etc/docker/seccomp/chrome.json -O ~/chrome.json
 
 # Base docker image
-FROM debian:sid-slim
+FROM debian:bullseye-slim
 LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
 # Install Chromium
+# Yes, including the Google API Keys sucks but even debian does the same: https://packages.debian.org/stretch/amd64/chromium/filelist
 RUN apt-get update && apt-get install -y \
       chromium \
       chromium-l10n \
@@ -32,7 +33,7 @@ RUN apt-get update && apt-get install -y \
       libexif-dev \
       libgl1-mesa-dri \
       libgl1-mesa-glx \
-      libpango1.0-0 \
+      libpangox-1.0-0 \
       libv4l-0 \
       fonts-symbola \
       --no-install-recommends \
@@ -40,19 +41,6 @@ RUN apt-get update && apt-get install -y \
     && mkdir -p /etc/chromium.d/ \
     && /bin/echo -e 'export GOOGLE_API_KEY="AIzaSyCkfPOPZXDKNn8hhgu3JrA62wIgC93d44k"\nexport GOOGLE_DEFAULT_CLIENT_ID="811574891467.apps.googleusercontent.com"\nexport GOOGLE_DEFAULT_CLIENT_SECRET="kdloedMFGdGla2P1zacGjAQh"' > /etc/chromium.d/googleapikeys
 
-# Download the google-talkplugin
-RUN buildDeps=' \
-		ca-certificates \
-		curl \
-	' \
-	&& set -x \
-	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& curl -sSL "https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb" -o /tmp/google-talkplugin-amd64.deb \
-	&& dpkg -i /tmp/google-talkplugin-amd64.deb \
-	&& rm -rf /tmp/*.deb \
-	&& apt-get purge -y --auto-remove $buildDeps
-
 # Add chromium user
 RUN groupadd -r chromium && useradd -r -g chromium -G audio,video chromium \
     && mkdir -p /home/chromium/Downloads && chown -R chromium:chromium /home/chromium

clair/Dockerfile

@@ -10,7 +10,7 @@ ENV GOPATH /go
 
 RUN go get github.com/quay/clair/cmd/clair || true
 
-ENV CLAIR_VERSION v2.1.1
+ENV CLAIR_VERSION v2.1.4
 
 WORKDIR /go/src/github.com/quay/clair
 

consul/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.12 as builder
+FROM golang:latest as builder
 MAINTAINER Jessica Frazelle <jess@linux.com>
 
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
@@ -29,7 +29,7 @@ RUN apt-get update && apt-get install -y \
 	--no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
-ENV CONSUL_VERSION v1.6.2
+ENV CONSUL_VERSION v1.8.0-beta2
 
 RUN go get github.com/hashicorp/consul || true
 

coredns/Dockerfile

@@ -10,7 +10,7 @@ RUN apk --no-cache add \
 	git \
 	make
 
-ENV COREDNS_VERSION v1.6.5
+ENV COREDNS_VERSION v1.6.9
 
 RUN git clone --depth 1 --branch ${COREDNS_VERSION} https://github.com/coredns/coredns /go/src/github.com/coredns/coredns
 

curl/Dockerfile

@@ -13,7 +13,7 @@ RUN apk add --no-cache \
 	nghttp2 \
 	openssl
 
-ENV CURL_VERSION 7.67.0
+ENV CURL_VERSION 7.70.0
 
 RUN set -x \
     && apk add --no-cache --virtual .build-deps \

distcc/Dockerfile

@@ -6,7 +6,6 @@ RUN apt-get update && apt-get install -y \
 	curl \
 	distcc \
 	git \
-	kernel-package \
 	make \
 	libncurses5-dev \
 	libssl-dev \

fleet/Dockerfile

@@ -12,7 +12,7 @@ RUN apk add --no-cache \
 	npm \
 	yarn
 
-ENV FLEET_VERSION 2.4.0
+ENV FLEET_VERSION 2.6.0
 
 RUN git clone --depth 1 --branch "${FLEET_VERSION}" https://github.com/kolide/fleet.git /go/src/github.com/kolide/fleet
 

fontpatcher/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim
+FROM debian:sid-slim
 LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
 RUN apt-get update && apt-get install -y \

gcalcli/Dockerfile

@@ -4,13 +4,12 @@ LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 ENV HOME /home/gcalcli
 
 RUN apk --no-cache add \
-	python \
+	python3 \
-	python-dev \
+	python3-dev \
-	py2-pip \
 	build-base \
 	&& adduser -S gcalcli \
 	&& chown -R gcalcli $HOME \
-	&& pip install vobject parsedatetime gcalcli
+	&& pip3 install vobject parsedatetime gcalcli
 
 WORKDIR $HOME
 USER gcalcli

gcloud/Dockerfile

@@ -1,7 +1,7 @@
 FROM python:2-alpine
 
 ENV PATH $PATH:/usr/src/google-cloud-sdk/bin
-ENV CLOUD_SDK_DOCKER_VERSION 272.0.0
+ENV CLOUD_SDK_DOCKER_VERSION 295.0.0
 
 RUN set -x \
 	&& apk add --no-cache --virtual .build-deps \

gitiles/Dockerfile

@@ -1,39 +1,27 @@
-FROM ubuntu:bionic
+FROM l.gcr.io/google/bazel:latest
 LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
 # https://gerrit.googlesource.com/gitiles/
-ENV GITILES_VERSION v0.3
+ENV GITILES_VERSION v0.4
 
 RUN apt-get update && apt-get install -y \
-	apt-transport-https \
 	bash \
 	ca-certificates \
 	curl \
 	git \
-	gnupg \
 	openjdk-8-jdk \
 	--no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
 # install bazel
 RUN set -x \
-	&& echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list \
-	&& curl https://bazel.build/bazel-release.pub.gpg | apt-key add - \
-	&& apt-get update && apt-get install -y \
-	bazel \
-	--no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& : install Bazel to build gitiles \
 	&& git clone --depth 1 --branch "${GITILES_VERSION}" https://gerrit.googlesource.com/gitiles /usr/src/gitiles \
 	&& ( \
 		cd /usr/src/gitiles \
 		&& bazel build java/com/google/gitiles/dev \
 		&& cp -rL bazel-bin bin \
 		&& rm -rf bazel-bin \
-	) \
+	)
-	&& : clean up unneeded packages and files \
-    && apt purge -y --auto-remove bazel \
-	&& rm /etc/apt/sources.list.d/bazel.list
 
 COPY start.sh /usr/bin/start.sh
 

keepassxc/Dockerfile

@@ -11,7 +11,7 @@
 FROM alpine:latest
 LABEL maintainer "Christian Koep <christiankoep@gmail.com>"
 
-ENV KEEPASSXC_VERSION 2.5.1
+ENV KEEPASSXC_VERSION 2.5.4
 
 RUN buildDeps=' \
 		automake \

kernel-builder/Dockerfile

@@ -1,7 +1,7 @@
 FROM r.j3ss.co/wireguard:install
 LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
-RUN apk add --no-cache \
+RUN apt update && apt -y install \
 	bash \
 	bc \
 	bison \
@@ -10,14 +10,12 @@ RUN apk add --no-cache \
 	fakeroot \
 	flex \
 	git \
-	gmp-dev \
+	libgmp-dev \
-	libressl-dev \
+	libncurses-dev \
-	mpc1-dev \
-	mpfr-dev \
-	ncurses-dev \
 	perl \
 	tar \
-	xz
+	--no-install-recommends \
+	&& rm -rf /var/lib/apt/lists/*
 
 ENV HOME /root
 WORKDIR $HOME

kvm/Dockerfile

@@ -19,7 +19,6 @@ RUN apt-get update && apt-get install -y \
 	libvirt-daemon-system \
 	procps \
 	python-gi \
-	python-ipaddr \
 	qemu-kvm \
 	virtinst \
 	virt-manager \

latest-versions.sh

@@ -46,11 +46,9 @@ get_latest() {
 	elif [[ "$dir" == "Tautulli" ]]; then
 		dir="plexpy"
 	elif [[ "$dir" == "zookeeper" ]]; then
-		dir="zookeeper/3.5"
+		dir="zookeeper/3.6"
 	elif [[ "$dir" == "oauth2_proxy" ]]; then
 		dir="oauth2-proxy"
-	elif [[ "$dir" == "wireguard" ]]; then
-		dir="wireguard/install"
 	fi
 
 	# Change to upper case for grep
@@ -60,6 +58,14 @@ get_latest() {
 	udir=${udir//-/_}
 	udir=${udir%/*}
 
+	if [[ "$dir" == "wireguard-tools" ]]; then
+		dir="wireguard/install"
+		udir="WIREGUARD_TOOLS"
+	elif [[ "$dir" == "wireguard-linux-compat" ]]; then
+		dir="wireguard/install"
+		udir="WIREGUARD"
+	fi
+
 	local current
 	if [[ ! -d "$dir" ]]; then
 		# If the directory does not exist, then grep all for it
@@ -86,7 +92,7 @@ get_latest_unifi() {
 
 compare() {
 	local name="$1" dir="$2" tag="$3" current="$4" releases="$5"
-	ignore_dirs=( "mc" "zookeeper/3.5" )
+	ignore_dirs=( "mc" "zookeeper/3.6" )
 
 	if [[ "$tag" =~ $current ]] || [[ "$name" =~ $current ]] || [[ "$current" =~ $tag ]] || [[ "$current" == "master" ]]; then
 		echo -e "\\e[36m${dir}:\\e[39m current ${current} | ${tag} | ${name}"
@@ -100,60 +106,65 @@ compare() {
 }
 
 projects=(
-iovisor/bcc
+	iovisor/bcc
-iovisor/bpftrace
+	iovisor/bpftrace
-browsh-org/browsh
+	browsh-org/browsh
-certbot/certbot
+	certbot/certbot
-cloudflare/cfssl
+	cloudflare/cfssl
-quay/clair
+	quay/clair
-hashicorp/consul
+	hashicorp/consul
-coredns/coredns
+	coredns/coredns
-CouchPotato/CouchPotatoServer
+	CouchPotato/CouchPotatoServer
-curl/curl
+	curl/curl
-kolide/fleet
+	kolide/fleet
-GoogleCloudPlatform/cloud-sdk-docker
+	GoogleCloudPlatform/cloud-sdk-docker
-google/gitiles
+	google/gitiles
-google/guetzli
+	google/guetzli
-irssi/irssi
+	irssi/irssi
-cryptodotis/irssi-otr
+	cryptodotis/irssi-otr
-keepassxreboot/keepassxc
+	keepassxreboot/keepassxc
-robertdavidgraham/masscan
+	robertdavidgraham/masscan
-MidnightCommander/mc
+	MidnightCommander/mc
-zyedidia/micro
+	zyedidia/micro
-mitmproxy/mitmproxy
+	mitmproxy/mitmproxy
-hashicorp/nomad
+	hashicorp/nomad
-nzbget/nzbget
+	nzbget/nzbget
-pusher/oauth2_proxy
+	pusher/oauth2_proxy
-facebook/osquery
+	facebook/osquery
-hashicorp/packer
+	hashicorp/packer
-Tautulli/Tautulli
+	Tautulli/Tautulli
-perkeep/perkeep
+	perkeep/perkeep
-pomerium/pomerium
+	pomerium/pomerium
-powershell/powershell
+	powershell/powershell
-Radarr/Radarr
+	Radarr/Radarr
-cesanta/docker_auth
+	cesanta/docker_auth
-ricochet-im/ricochet
+	ricochet-im/ricochet
-reverse-shell/routersploit
+	reverse-shell/routersploit
-rstudio/rstudio
+	rstudio/rstudio
-tarsnap/tarsnap
+	tarsnap/tarsnap
-nginx/nginx
+	nginx/nginx
-simplresty/ngx_devel_kit
+	simplresty/ngx_devel_kit
-openresty/lua-nginx-module
+	openresty/luajit2
-leev/ngx_http_geoip2_module
+	openresty/lua-cjson
-maxmind/libmaxminddb
+	openresty/lua-nginx-module
-hashicorp/terraform
+	leev/ngx_http_geoip2_module
-kdlucas/byte-unixbench
+	maxmind/libmaxminddb
-mitchellh/vagrant
+	openresty/lua-resty-core
-hashicorp/vault
+	openresty/lua-resty-lrucache
-containrrr/watchtower
+	hashicorp/terraform
-wireguard/wireguard
+	kdlucas/byte-unixbench
-znc/znc
+	mitchellh/vagrant
-apache/zookeeper
+	hashicorp/vault
-tianon/gosu
+	containrrr/watchtower
+	wireguard/wireguard-tools
+	wireguard/wireguard-linux-compat
+	znc/znc
+	apache/zookeeper
+	tianon/gosu
 )
 
 other_projects=(
-unifi
+	unifi
 )
 
 bad_versions=()

lkp-tests/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim
+FROM debian:buster-slim
 LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
 ENV DEBIAN_FRONTEND noninteractive

mailman/Dockerfile

@@ -1,26 +0,0 @@
-FROM debian:bullseye-slim
-LABEL maintainer "Jessie Frazelle <jess@linux.com>"
-
-# run
-# docker run -d -p 1234:80 -p 25:25 jess/mailman
-#
-# curl http://localhost:1234/cgi-bin/mailman/admin
-# for admin screen
-
-ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update && apt-get install -y \
-	lighttpd \
-	mailman \
-	postfix \
-	supervisor \
-	--no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/*
-
-# Lighttpd configuration
-COPY lighttpd.conf /etc/lighttpd/lighttpd.conf
-
-COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-
-EXPOSE 25 80
-
-ENTRYPOINT [ "supervisord" ]

mailman/lighttpd.conf

@@ -1,48 +0,0 @@
-server.modules = (
-         "mod_cgi"
-#        ,"mod_access"
-         ,"mod_alias"
-#        ,"mod_compress"
-#        ,"mod_redirect"
-#        ,"mod_rewrite"
-)
-
-server.document-root        = "/usr/lib/cgi-bin/mailman/"
-server.dir-listing          = "disable"
-server.upload-dirs          = ( "/var/cache/lighttpd/uploads" )
-server.errorlog             = "/var/log/lighttpd/error.log"
-server.pid-file             = "/var/run/lighttpd.pid"
-server.username             = "www-data"
-server.groupname            = "www-data"
-server.port                 = 80
-
-
-#index-file.names            = ( "index.php", "index.html", "index.lighttpd.html" )
-#url.access-deny             = ( "~", ".inc" )
-#static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
-
-#compress.cache-dir          = "/var/cache/lighttpd/compress/"
-#compress.filetype           = ( "application/javascript", "text/css", "text/html", "text/plain" )
-
-# default listening port for IPv6 falls back to the IPv4 port
-## Use ipv6 if available
-#include_shell "/usr/share/lighttpd/use-ipv6.pl " + server.port
-include_shell "/usr/share/lighttpd/create-mime.assign.pl"
-#include_shell "/usr/share/lighttpd/include-conf-enabled.pl"
-
-alias.url = ( "/images/mailman/"  => "/usr/share/images/mailman/",
-              "/pipermail/"       => "/var/lib/mailman/archives/public/",
-              "/cgi-bin/mailman/" => "/usr/lib/cgi-bin/mailman/"          )
-
-cgi.assign = (  "/admin" => "",
-                "/admindb" => "",
-                "/confirm" => "",
-                "/create" => "",
-                "/edithtml" => "",
-                "/listinfo" => "",
-                "/options" => "",
-                "/private" => "",
-                "/rmlist" => "",
-                "/roster" => "",
-                "/subscribe" => "")
-

mailman/supervisord.conf

@@ -1,11 +0,0 @@
-[supervisord]
-nodaemon=true
-
-[program:postfix]
-command=/etc/init.d/postfix start
-
-[program:lighttpd]
-command=/usr/sbin/lighttpd -f /etc/lighttpd/lighttpd.conf
-
-[program:mailman]
-command=/etc/init.d/mailman start

metasploit/Dockerfile

@@ -1,11 +0,0 @@
-FROM r.j3ss.co/kalilinux
-LABEL maintainer "Christian Koep <christiankoep@gmail.com>"
-
-RUN apt-get update && apt-get upgrade -y && apt-get install -y \
-    metasploit-framework \
-    --no-install-recommends \
-    && rm -rf /var/lib/apt/lists/*
-
-COPY start.sh /start.sh
-
-ENTRYPOINT [ "/start.sh" ]

metasploit/start.sh

@@ -1,15 +0,0 @@
-#!/bin/sh
-set -e
-
-if ! [ -e "/var/run/postgresql/*.pid" ]
-then
-    /etc/init.d/postgresql start
-fi
-
-if ! [ -e "/usr/share/metasploit-framework/config/database.yml" ]
-then
-    /usr/bin/msfdb init
-fi
-
-/usr/bin/msfdb start
-/usr/bin/msfconsole

micro/Dockerfile

@@ -9,7 +9,7 @@ RUN apk --no-cache add \
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
 
-ENV MICRO_VERSION v1.4.1
+ENV MICRO_VERSION v2.0.4
 
 RUN git clone --depth 1 --branch "$MICRO_VERSION" https://github.com/zyedidia/micro /go/src/github.com/zyedidia/micro
 

mitmproxy/Dockerfile

@@ -16,7 +16,7 @@ RUN groupadd -r mitmproxy && useradd -r -g mitmproxy mitmproxy \
 	&& chown -R mitmproxy:mitmproxy /home/mitmproxy
 
 # Download the binaries.
-ENV MITMPROXY_VERSION 4.0.4
+ENV MITMPROXY_VERSION 5.1.1
 RUN curl -sSL "https://snapshots.mitmproxy.org/${MITMPROXY_VERSION}/mitmproxy-${MITMPROXY_VERSION}-linux.tar.gz" | tar -vxzC /usr/local/bin
 
 VOLUME /home/mitmproxy/.mitmproxy

nes/Dockerfile

@@ -19,6 +19,7 @@ RUN apt-get update && apt-get install -y \
 	libgl1-mesa-dev \
 	libgl1-mesa-dri \
 	libxcursor-dev \
+	libxxf86vm-dev \
 	libxi-dev \
 	libxinerama-dev \
 	libxrandr-dev \

nomad/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.11 as builder
+FROM golang:latest as builder
 MAINTAINER Jessica Frazelle <jess@linux.com>
 
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
@@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y \
 	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
 	&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 
-RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
+RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
 
 RUN apt-get update && apt-get install -y \
 	gcc \
@@ -21,7 +21,6 @@ RUN apt-get update && apt-get install -y \
 	g++ \
 	make \
 	nodejs \
-	npm \
 	pkgconf \
 	python \
 	yarn \
@@ -29,7 +28,7 @@ RUN apt-get update && apt-get install -y \
     --no-install-recommends \
     && rm -rf /var/lib/apt/lists/*
 
-ENV NOMAD_VERSION v0.10.2
+ENV NOMAD_VERSION v0.11.2
 
 RUN go get github.com/hashicorp/nomad
 

oauth2-proxy/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.12-alpine as builder
+FROM golang:alpine as builder
 LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
 RUN	apk --no-cache add \
@@ -8,9 +8,7 @@ RUN	apk --no-cache add \
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
 
-ENV OAUTH2_PROXY_VERSION v4.0.0
+ENV OAUTH2_PROXY_VERSION v5.1.1
-
-RUN go get github.com/golang/dep/cmd/dep
 
 RUN go get github.com/pusher/oauth2_proxy || true \
 	&& cd /go/src/github.com/pusher/oauth2_proxy \

osquery/Dockerfile

@@ -16,7 +16,7 @@ RUN apt-get update && apt-get install -y \
 	&& curl -sSL https://apt.kitware.com/keys/kitware-archive-latest.asc | apt-key add - \
 	&& echo 'deb https://apt.kitware.com/ubuntu/ bionic main' > /etc/apt/sources.list.d/cmake.list
 
-ENV OSQUERY_VERSION 4.0.2
+ENV OSQUERY_VERSION 4.3.0
 
 RUN buildDeps=' \
 		bison \

packer/Dockerfile

@@ -12,7 +12,7 @@ RUN	apk add --no-cache \
 	make \
 	zip
 
-ENV PACKER_VERSION v1.4.4
+ENV PACKER_VERSION v1.5.3
 
 RUN go get github.com/hashicorp/packer
 

perkeep/Dockerfile

@@ -8,7 +8,7 @@ RUN	apk --no-cache add \
 ENV PERKEEP_VERSION 0.10
 
 RUN mkdir -p /go/src/perkeep.org \
-	&& git clone --depth 1 --branch "${PERKEEP_VERSION}" https://camlistore.googlesource.com/camlistore.git /go/src/perkeep.org \
+	&& git clone --depth 1 --branch "${PERKEEP_VERSION}" https://github.com/perkeep/perkeep.git /go/src/perkeep.org \
 	&& cd /go/src/perkeep.org \
 	&& go run make.go \
 	&& cp -vr /go/bin/* /usr/local/bin/ \

plexpy/Dockerfile

@@ -15,7 +15,7 @@ RUN apk add --no-cache \
 	py-pip
 
 # Get the source
-ENV PLEXPY_VERSION v2.1.38
+ENV PLEXPY_VERSION v2.2.4
 RUN git clone https://github.com/Tautulli/Tautulli.git /opt/plexpy \
 	&& ( \
 		cd /opt/plexpy \

pomerium/Dockerfile

@@ -9,7 +9,7 @@ RUN	apk --no-cache add \
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
 
-ENV POMERIUM_VERSION v0.5.2
+ENV POMERIUM_VERSION v0.9.0
 
 RUN go get github.com/pomerium/pomerium || true \
 	&& cd /go/src/github.com/pomerium/pomerium \

pond/Dockerfile

@@ -1,44 +0,0 @@
-FROM golang:latest as builder
-LABEL maintainer "Jessie Frazelle <jess@linux.com>"
-
-ENV PATH /go/bin:/usr/local/go/bin:$PATH
-ENV GOPATH /go
-
-RUN	apt-get update && apt-get install -y \
-	libgtk-3-dev \
-	libgtkspell3-3-dev \
-	libtspi-dev \
-	pkg-config \
-	--no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/*
-
-RUN go get -d -v github.com/agl/pond/client \
-	&& go get -d -v github.com/agl/pond/server
-
-WORKDIR /go/src/github.com/agl/pond
-
-RUN go build -o /usr/bin/pond-client ./client \
-	&& go build -o /usr/bin/pond-server ./server
-
-FROM debian:bullseye-slim
-
-RUN	apt-get update && apt-get install -y \
-	ca-certificates \
-	libgtk-3-0 \
-	libgtkspell3-3-0 \
-	libtspi1 \
-	--no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/*
-
-# create pond user
-ENV HOME /home/pond
-RUN useradd --create-home --home-dir $HOME pond \
-    && chown -R pond:pond $HOME
-
-WORKDIR $HOME
-USER pond
-
-COPY --from=builder /usr/bin/pond-client /usr/bin/pond-client
-COPY --from=builder /usr/bin/pond-server /usr/bin/pond-server
-
-CMD [ "pond-client", "-cli" ]

powershell/Dockerfile

@@ -1,7 +1,7 @@
 FROM debian:stretch-slim
 LABEL maintainer "Christian Koep <christiankoep@gmail.com>"
 
-ENV POWERSHELL_VERSION 6.2.3
+ENV POWERSHELL_VERSION 7.0.1
 
 RUN apt-get update && apt-get install -y \
 	ca-certificates \
@@ -18,8 +18,9 @@ RUN apt-get update && apt-get install -y \
 RUN cd /usr/src \
 	&& wget "https://github.com/PowerShell/PowerShell/releases/download/v${POWERSHELL_VERSION}/powershell_${POWERSHELL_VERSION}-1.debian.9_amd64.deb" -O /tmp/powershell.deb \
 	&& dpkg -i /tmp/powershell.deb \
-	&& ln -snf "/opt/microsoft/powershell/6/pwsh" /usr/bin/pwsh \
+	&& ln -snf "/opt/microsoft/powershell/7/pwsh" /usr/bin/pwsh \
 	&& apt-get install -fy \
-	&& rm -rf /var/lib/apt/lists/* /usr/src/* /tmp/powershell.deb
+	&& rm -rf /var/lib/apt/lists/* /usr/src/* /tmp/powershell.deb \
+	&& which pwsh
 
 ENTRYPOINT [ "/usr/bin/pwsh" ]

radarr/Dockerfile

@@ -14,7 +14,7 @@ RUN apk add --no-cache \
 		--repository https://dl-4.alpinelinux.org/alpine/edge/testing
 
 # https://github.com/Radarr/Radarr/releases
-ENV RADARR_VERSION 0.2.0.1450
+ENV RADARR_VERSION 0.2.0.1480
 RUN mkdir -p /opt/radarr \
 	&& wget "https://github.com/Radarr/Radarr/releases/download/v${RADARR_VERSION}/Radarr.develop.${RADARR_VERSION}.linux.tar.gz" -O /tmp/radarr.tar.gz \
 	&& tar -xzvf /tmp/radarr.tar.gz -C /opt/radarr --strip-components 1 \

registry-auth/Dockerfile

@@ -14,7 +14,7 @@ RUN apk add --no-cache \
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
 
-ENV DOCKER_AUTH_VERSION 1.3.1
+ENV DOCKER_AUTH_VERSION 1.5.0
 
 RUN git clone --depth 1 --branch ${DOCKER_AUTH_VERSION} https://github.com/cesanta/docker_auth /go/src/github.com/cesanta/docker_auth
 

requestbin/Dockerfile

@@ -3,11 +3,13 @@ FROM python:2-alpine
 RUN apk add --no-cache --virtual .build-deps \
 		build-base \
 		git \
+		libffi-dev \
+		--repository http://dl-cdn.alpinelinux.org/alpine/edge/main/ \
 	&& git clone --depth 1 https://github.com/Runscope/requestbin /src \
+	&& sed -i 's/gevent/gevent==1.4.0/' /src/requirements.txt \
+	&& echo "Flask==1.1.1" >> /src/requirements.txt \
+	&& echo "Werkzeug==0.15.6" >> /src/requirements.txt \
     && pip install -r /src/requirements.txt \
-	&& pip install --no-cache-dir  \
-		gevent \
-		gunicorn \
     && rm -rf ~/.pip/cache \
 	&& apk del .build-deps
 

routersploit/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:sid-slim
+FROM debian:buster-slim
 LABEL maintainer "Christian Koep <christiankoep@gmail.com>"
 
 ENV ROUTERSPLOIT_VERSION v3.4.0

rstudio/Dockerfile

@@ -57,7 +57,7 @@ RUN apt-get update && apt-get install -y \
 	&& rm -rf /var/lib/apt/lists/*
 
 # https://www.rstudio.com/products/rstudio/download/#download
-ENV RSTUDIO_VERSION 1.2.5019
+ENV RSTUDIO_VERSION 1.3.959
 
 # Download the source
 RUN curl -sSL "https://download1.rstudio.org/desktop/bionic/amd64/rstudio-${RSTUDIO_VERSION}-amd64.deb" -o /tmp/rstudio-amd64.deb \

telize/Dockerfile

@@ -1,199 +1,32 @@
-FROM alpine:latest
+FROM shurshun/openresty:latest
-
-RUN apk add --no-cache \
-	lua5.1-cjson \
-	luajit
-
-ENV NGINX_VERSION 1.17.6
-# https://github.com/simplresty/ngx_devel_kit/releases
-ENV NGX_DEVEL_KIT_VERSION v0.3.1rc1
-# https://github.com/openresty/lua-nginx-module/releases
-ENV LUA_NGINX_MODULE_VERSION v0.10.15
-# https://github.com/leev/ngx_http_geoip2_module/releases
-ENV NGX_HTTP_GEOIP2_MODULE_VERSION 3.3
-# https://github.com/maxmind/libmaxminddb/releases
-ENV LIBMAXMINDDB_VERSION 1.4.2
-
-# Tell nginx's build system where to find LuaJIT 2.1:
-ENV LUAJIT_LIB=/usr/lib/
-ENV LUAJIT_INC=/usr/include/luajit-2.1/
-
-RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
-	&& CONFIG="\
-		--prefix=/etc/nginx \
-		--sbin-path=/usr/sbin/nginx \
-		--modules-path=/usr/lib/nginx/modules \
-		--conf-path=/etc/nginx/nginx.conf \
-		--error-log-path=/var/log/nginx/error.log \
-		--http-log-path=/var/log/nginx/access.log \
-		--pid-path=/var/run/nginx.pid \
-		--lock-path=/var/run/nginx.lock \
-		--http-client-body-temp-path=/var/cache/nginx/client_temp \
-		--http-proxy-temp-path=/var/cache/nginx/proxy_temp \
-		--http-fastcgi-temp-path=/var/cache/nginx/fastcgi_temp \
-		--http-uwsgi-temp-path=/var/cache/nginx/uwsgi_temp \
-		--http-scgi-temp-path=/var/cache/nginx/scgi_temp \
-		--user=nginx \
-		--group=nginx \
-		--with-http_ssl_module \
-		--with-http_realip_module \
-		--with-http_addition_module \
-		--with-http_sub_module \
-		--with-http_dav_module \
-		--with-http_flv_module \
-		--with-http_mp4_module \
-		--with-http_gunzip_module \
-		--with-http_gzip_static_module \
-		--with-http_random_index_module \
-		--with-http_secure_link_module \
-		--with-http_stub_status_module \
-		--with-http_auth_request_module \
-		--with-http_xslt_module=dynamic \
-		--with-http_image_filter_module=dynamic \
-		--with-http_geoip_module=dynamic \
-		--with-threads \
-		--with-stream \
-		--with-stream_ssl_module \
-		--with-stream_ssl_preread_module \
-		--with-stream_realip_module \
-		--with-stream_geoip_module=dynamic \
-		--with-http_slice_module \
-		--with-mail \
-		--with-mail_ssl_module \
-		--with-compat \
-		--with-file-aio \
-		--with-http_v2_module \
-		--with-ld-opt='-Wl,-rpath,/usr/lib/' \
-		--add-module=/usr/src/ngx_devel_kit \
-		--add-module=/usr/src/lua-nginx-module \
-		--add-module=/usr/src/ngx_http_geoip2_module \
-	" \
-	&& addgroup -S nginx \
-	&& adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx nginx \
-	&& apk add --no-cache --virtual .build-deps \
-		autoconf \
-		automake \
-		gcc \
-		git \
-		libc-dev \
-		make \
-		openssl-dev \
-		pcre-dev \
-		zlib-dev \
-		linux-headers \
-		curl \
-		gnupg \
-		libxslt-dev \
-		gd-dev \
-		geoip-dev \
-		luajit-dev \
-		musl-utils \
-		file \
-	&& git clone --depth 1 --branch "${NGX_DEVEL_KIT_VERSION}" https://github.com/simplresty/ngx_devel_kit.git /usr/src/ngx_devel_kit \
-	&& git clone --depth 1 --branch "${LUA_NGINX_MODULE_VERSION}" https://github.com/openresty/lua-nginx-module.git /usr/src/lua-nginx-module \
-	&& git clone --depth 1 --branch "${NGX_HTTP_GEOIP2_MODULE_VERSION}" https://github.com/leev/ngx_http_geoip2_module.git /usr/src/ngx_http_geoip2_module \
-	&& mkdir -p /usr/src/libmaxminddb \
-	&& curl -sSL "https://github.com/maxmind/libmaxminddb/releases/download/${LIBMAXMINDDB_VERSION}/libmaxminddb-${LIBMAXMINDDB_VERSION}.tar.gz" | tar -xzf - --strip-components 1 -C /usr/src/libmaxminddb \
-	&& ( \
-		cd /usr/src/libmaxminddb \
-		&& ./configure \
-		&& make \
-		&& make check \
-		&& make install \
-		&& ldconfig || true \
-	) \
-	&& curl -fSL http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz -o nginx.tar.gz \
-	&& curl -fSL http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz.asc  -o nginx.tar.gz.asc \
-	&& export GNUPGHOME="$(mktemp -d)" \
-	&& found=''; \
-	for server in \
-		ha.pool.sks-keyservers.net \
-		hkp://keyserver.ubuntu.com:80 \
-		hkp://p80.pool.sks-keyservers.net:80 \
-		pgp.mit.edu \
-	; do \
-		echo "Fetching GPG key $GPG_KEYS from $server"; \
-		gpg --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$GPG_KEYS" && found=yes && break; \
-	done; \
-	test -z "$found" && echo >&2 "error: failed to fetch GPG key $GPG_KEYS" && exit 1; \
-	gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \
-	&& rm -r "$GNUPGHOME" nginx.tar.gz.asc \
-	&& mkdir -p /usr/src \
-	&& tar -zxC /usr/src -f nginx.tar.gz \
-	&& rm nginx.tar.gz \
-	&& ( \
-		cd /usr/src/nginx-$NGINX_VERSION \
-		&& ./configure $CONFIG --with-debug \
-		&& make -j$(getconf _NPROCESSORS_ONLN) \
-		&& mv objs/nginx objs/nginx-debug \
-		&& mv objs/ngx_http_xslt_filter_module.so objs/ngx_http_xslt_filter_module-debug.so \
-		&& mv objs/ngx_http_image_filter_module.so objs/ngx_http_image_filter_module-debug.so \
-		&& mv objs/ngx_http_geoip_module.so objs/ngx_http_geoip_module-debug.so \
-		&& mv objs/ngx_stream_geoip_module.so objs/ngx_stream_geoip_module-debug.so \
-		&& ./configure $CONFIG \
-		&& make -j$(getconf _NPROCESSORS_ONLN) \
-		&& make install \
-		&& rm -rf /etc/nginx/html/ \
-		&& mkdir /etc/nginx/conf.d/ \
-		&& mkdir -p /usr/share/nginx/html/ \
-		&& install -m644 html/index.html /usr/share/nginx/html/ \
-		&& install -m644 html/50x.html /usr/share/nginx/html/ \
-		&& install -m755 objs/nginx-debug /usr/sbin/nginx-debug \
-		&& install -m755 objs/ngx_http_xslt_filter_module-debug.so /usr/lib/nginx/modules/ngx_http_xslt_filter_module-debug.so \
-		&& install -m755 objs/ngx_http_image_filter_module-debug.so /usr/lib/nginx/modules/ngx_http_image_filter_module-debug.so \
-		&& install -m755 objs/ngx_http_geoip_module-debug.so /usr/lib/nginx/modules/ngx_http_geoip_module-debug.so \
-		&& install -m755 objs/ngx_stream_geoip_module-debug.so /usr/lib/nginx/modules/ngx_stream_geoip_module-debug.so \
-		&& ln -s ../../usr/lib/nginx/modules /etc/nginx/modules \
-		&& strip /usr/sbin/nginx* \
-		&& strip /usr/lib/nginx/modules/*.so \
-	) \
-	&& rm -rf /usr/src/nginx-$NGINX_VERSION /usr/src/ngx_devel_kit /usr/src/lua-nginx-module /usr/src/ngx_http_geoip2_module /usr/src/libmaxminddb \
-	\
-	# Bring in gettext so we can get `envsubst`, then throw
-	# the rest away. To do this, we need to install `gettext`
-	# then move `envsubst` out of the way so `gettext` can
-	# be deleted completely, then move `envsubst` back.
-	&& apk add --no-cache --virtual .gettext gettext \
-	&& mv /usr/bin/envsubst /tmp/ \
-	\
-	&& runDeps="$( \
-		scanelf --needed --nobanner --format '%n#p' /usr/sbin/nginx /usr/lib/nginx/modules/*.so /tmp/envsubst \
-			| tr ',' '\n' \
-			| sort -u \
-			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-	)" \
-	&& apk add --no-cache --virtual .nginx-rundeps $runDeps \
-	&& apk del .build-deps \
-	&& apk del .gettext \
-	&& mv /tmp/envsubst /usr/local/bin/ \
-	\
-	# forward request and error logs to docker log collector
-	&& ln -sf /dev/stdout /var/log/nginx/access.log \
-	&& ln -sf /dev/stderr /var/log/nginx/error.log
 
 STOPSIGNAL SIGTERM
 
 EXPOSE 80 443
 
 ENV TELIZE_VERSION 66063c6c6e5bbbafcf493c5bc7c825f0a6e1b03d
+ENV LICENSE_KEY lgNvGyhnUKpa5PJi
+
+RUN apk add --no-cache \
+	ca-certificates \
+	curl \
+	git
+
+RUN addgroup -S nginx \
+	&& adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx nginx
 
 RUN set -x \
-	&& apk add --no-cache --virtual .build-deps \
+       && mkdir -p /usr/share/GeoIP \
-		curl \
+       && curl -sSL "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-Country&license_key=${LICENSE_KEY}&suffix=tar.gz" | tar -xzf - --strip-components 1 -C /usr/share/GeoIP \
-		git \
+       && curl -sSL "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-City&license_key=${LICENSE_KEY}&suffix=tar.gz" | tar -xzf - --strip-components 1 -C /usr/share/GeoIP \
-	&& rm -rf /var/lib/apt/lists/* \
+       && curl -sSL "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-ASN&license_key=${LICENSE_KEY}&suffix=tar.gz" | tar -xzf - --strip-components 1 -C /usr/share/GeoIP \
-	&& mkdir -p /usr/share/GeoIP \
+       && git clone https://github.com/fcambus/telize.git /usr/src/telize \
-	&& curl -sSL "http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.tar.gz" | tar -xzf - --strip-components 1 -C /usr/share/GeoIP \
+       && ( \
-	&& curl -sSL "http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz" | tar -xzf - --strip-components 1 -C /usr/share/GeoIP \
+               cd /usr/src/telize \
-	&& curl -sSL "http://geolite.maxmind.com/download/geoip/database/GeoLite2-ASN.tar.gz" | tar -xzf - --strip-components 1 -C /usr/share/GeoIP \
+               && git checkout "$TELIZE_VERSION" \
-	&& git clone https://github.com/fcambus/telize.git /usr/src/telize \
+               && cp *.conf /etc/nginx/ \
-	&& ( \
+       ) \
-		cd /usr/src/telize \
+       && rm -rf /usr/src/telize
-		&& git checkout "$TELIZE_VERSION" \
-		&& cp *.conf /etc/nginx/ \
-	) \
-	&& rm -rf /usr/src/telize \
-	&& apk del .build-deps
 
 COPY nginx.conf /etc/nginx/nginx.conf
 COPY mime.types /etc/nginx/mime.types

telize/country-code3.conf

@@ -0,0 +1,251 @@
+map $geoip2_country_code $geoip2_country_code3 {
+	"AD" "AND";
+	"AE" "ARE";
+	"AF" "AFG";
+	"AG" "ATG";
+	"AI" "AIA";
+	"AL" "ALB";
+	"AM" "ARM";
+	"AO" "AGO";
+	"AQ" "ATA";
+	"AR" "ARG";
+	"AS" "ASM";
+	"AT" "AUT";
+	"AU" "AUS";
+	"AW" "ABW";
+	"AX" "ALA";
+	"AZ" "AZE";
+	"BA" "BIH";
+	"BB" "BRB";
+	"BD" "BGD";
+	"BE" "BEL";
+	"BF" "BFA";
+	"BG" "BGR";
+	"BH" "BHR";
+	"BI" "BDI";
+	"BJ" "BEN";
+	"BL" "BLM";
+	"BM" "BMU";
+	"BN" "BRN";
+	"BO" "BOL";
+	"BQ" "BES";
+	"BR" "BRA";
+	"BS" "BHS";
+	"BT" "BTN";
+	"BV" "BVT";
+	"BW" "BWA";
+	"BY" "BLR";
+	"BZ" "BLZ";
+	"CA" "CAN";
+	"CC" "CCK";
+	"CD" "COD";
+	"CF" "CAF";
+	"CG" "COG";
+	"CH" "CHE";
+	"CI" "CIV";
+	"CK" "COK";
+	"CL" "CHL";
+	"CM" "CMR";
+	"CN" "CHN";
+	"CO" "COL";
+	"CR" "CRI";
+	"CU" "CUB";
+	"CV" "CPV";
+	"CW" "CUW";
+	"CX" "CXR";
+	"CY" "CYP";
+	"CZ" "CZE";
+	"DE" "DEU";
+	"DJ" "DJI";
+	"DK" "DNK";
+	"DM" "DMA";
+	"DO" "DOM";
+	"DZ" "DZA";
+	"EC" "ECU";
+	"EE" "EST";
+	"EG" "EGY";
+	"EH" "ESH";
+	"ER" "ERI";
+	"ES" "ESP";
+	"ET" "ETH";
+	"FI" "FIN";
+	"FJ" "FJI";
+	"FK" "FLK";
+	"FM" "FSM";
+	"FO" "FRO";
+	"FR" "FRA";
+	"GA" "GAB";
+	"GB" "GBR";
+	"GD" "GRD";
+	"GE" "GEO";
+	"GF" "GUF";
+	"GG" "GGY";
+	"GH" "GHA";
+	"GI" "GIB";
+	"GL" "GRL";
+	"GM" "GMB";
+	"GN" "GIN";
+	"GP" "GLP";
+	"GQ" "GNQ";
+	"GR" "GRC";
+	"GS" "SGS";
+	"GT" "GTM";
+	"GU" "GUM";
+	"GW" "GNB";
+	"GY" "GUY";
+	"HK" "HKG";
+	"HM" "HMD";
+	"HN" "HND";
+	"HR" "HRV";
+	"HT" "HTI";
+	"HU" "HUN";
+	"ID" "IDN";
+	"IE" "IRL";
+	"IL" "ISR";
+	"IM" "IMN";
+	"IN" "IND";
+	"IO" "IOT";
+	"IQ" "IRQ";
+	"IR" "IRN";
+	"IS" "ISL";
+	"IT" "ITA";
+	"JE" "JEY";
+	"JM" "JAM";
+	"JO" "JOR";
+	"JP" "JPN";
+	"KE" "KEN";
+	"KG" "KGZ";
+	"KH" "KHM";
+	"KI" "KIR";
+	"KM" "COM";
+	"KN" "KNA";
+	"KP" "PRK";
+	"KR" "KOR";
+	"KW" "KWT";
+	"KY" "CYM";
+	"KZ" "KAZ";
+	"LA" "LAO";
+	"LB" "LBN";
+	"LC" "LCA";
+	"LI" "LIE";
+	"LK" "LKA";
+	"LR" "LBR";
+	"LS" "LSO";
+	"LT" "LTU";
+	"LU" "LUX";
+	"LV" "LVA";
+	"LY" "LBY";
+	"MA" "MAR";
+	"MC" "MCO";
+	"MD" "MDA";
+	"ME" "MNE";
+	"MF" "MAF";
+	"MG" "MDG";
+	"MH" "MHL";
+	"MK" "MKD";
+	"ML" "MLI";
+	"MM" "MMR";
+	"MN" "MNG";
+	"MO" "MAC";
+	"MP" "MNP";
+	"MQ" "MTQ";
+	"MR" "MRT";
+	"MS" "MSR";
+	"MT" "MLT";
+	"MU" "MUS";
+	"MV" "MDV";
+	"MW" "MWI";
+	"MX" "MEX";
+	"MY" "MYS";
+	"MZ" "MOZ";
+	"NA" "NAM";
+	"NC" "NCL";
+	"NE" "NER";
+	"NF" "NFK";
+	"NG" "NGA";
+	"NI" "NIC";
+	"NL" "NLD";
+	"NO" "NOR";
+	"NP" "NPL";
+	"NR" "NRU";
+	"NU" "NIU";
+	"NZ" "NZL";
+	"OM" "OMN";
+	"PA" "PAN";
+	"PE" "PER";
+	"PF" "PYF";
+	"PG" "PNG";
+	"PH" "PHL";
+	"PK" "PAK";
+	"PL" "POL";
+	"PM" "SPM";
+	"PN" "PCN";
+	"PR" "PRI";
+	"PS" "PSE";
+	"PT" "PRT";
+	"PW" "PLW";
+	"PY" "PRY";
+	"QA" "QAT";
+	"RE" "REU";
+	"RO" "ROU";
+	"RS" "SRB";
+	"RU" "RUS";
+	"RW" "RWA";
+	"SA" "SAU";
+	"SB" "SLB";
+	"SC" "SYC";
+	"SD" "SDN";
+	"SE" "SWE";
+	"SG" "SGP";
+	"SH" "SHN";
+	"SI" "SVN";
+	"SJ" "SJM";
+	"SK" "SVK";
+	"SL" "SLE";
+	"SM" "SMR";
+	"SN" "SEN";
+	"SO" "SOM";
+	"SR" "SUR";
+	"SS" "SSD";
+	"ST" "STP";
+	"SV" "SLV";
+	"SX" "SXM";
+	"SY" "SYR";
+	"SZ" "SWZ";
+	"TC" "TCA";
+	"TD" "TCD";
+	"TF" "ATF";
+	"TG" "TGO";
+	"TH" "THA";
+	"TJ" "TJK";
+	"TK" "TKL";
+	"TL" "TLS";
+	"TM" "TKM";
+	"TN" "TUN";
+	"TO" "TON";
+	"TR" "TUR";
+	"TT" "TTO";
+	"TV" "TUV";
+	"TW" "TWN";
+	"TZ" "TZA";
+	"UA" "UKR";
+	"UG" "UGA";
+	"UM" "UMI";
+	"US" "USA";
+	"UY" "URY";
+	"UZ" "UZB";
+	"VA" "VAT";
+	"VC" "VCT";
+	"VE" "VEN";
+	"VG" "VGB";
+	"VI" "VIR";
+	"VN" "VNM";
+	"VU" "VUT";
+	"WF" "WLF";
+	"WS" "WSM";
+	"YE" "YEM";
+	"YT" "MYT";
+	"ZA" "ZAF";
+	"ZM" "ZMB";
+	"ZW" "ZWE";
+}

telize/timezone-offset.conf

@@ -0,0 +1,485 @@
+map $geoip2_timezone $geoip2_offset {
+	"Africa/Abidjan" 0;
+	"Africa/Accra" 0;
+	"Africa/Addis_Ababa" 10800;
+	"Africa/Algiers" 3600;
+	"Africa/Asmara" 10800;
+	"Africa/Asmera" 10800;
+	"Africa/Bamako" 0;
+	"Africa/Bangui" 3600;
+	"Africa/Banjul" 0;
+	"Africa/Bissau" 0;
+	"Africa/Blantyre" 7200;
+	"Africa/Brazzaville" 3600;
+	"Africa/Bujumbura" 7200;
+	"Africa/Cairo" 7200;
+	"Africa/Casablanca" 0;
+	"Africa/Ceuta" 3600;
+	"Africa/Conakry" 0;
+	"Africa/Dakar" 0;
+	"Africa/Dar_es_Salaam" 10800;
+	"Africa/Djibouti" 10800;
+	"Africa/Douala" 3600;
+	"Africa/El_Aaiun" 0;
+	"Africa/Freetown" 0;
+	"Africa/Gaborone" 7200;
+	"Africa/Harare" 7200;
+	"Africa/Johannesburg" 7200;
+	"Africa/Juba" 10800;
+	"Africa/Kampala" 10800;
+	"Africa/Khartoum" 7200;
+	"Africa/Kigali" 7200;
+	"Africa/Kinshasa" 3600;
+	"Africa/Lagos" 3600;
+	"Africa/Libreville" 3600;
+	"Africa/Lome" 0;
+	"Africa/Luanda" 3600;
+	"Africa/Lubumbashi" 7200;
+	"Africa/Lusaka" 7200;
+	"Africa/Malabo" 3600;
+	"Africa/Maputo" 7200;
+	"Africa/Maseru" 7200;
+	"Africa/Mbabane" 7200;
+	"Africa/Mogadishu" 10800;
+	"Africa/Monrovia" 0;
+	"Africa/Nairobi" 10800;
+	"Africa/Ndjamena" 3600;
+	"Africa/Niamey" 3600;
+	"Africa/Nouakchott" 0;
+	"Africa/Ouagadougou" 0;
+	"Africa/Porto-Novo" 3600;
+	"Africa/Sao_Tome" 3600;
+	"Africa/Timbuktu" 0;
+	"Africa/Tripoli" 7200;
+	"Africa/Tunis" 3600;
+	"Africa/Windhoek" 7200;
+	"America/Adak" -36000;
+	"America/Anchorage" -32400;
+	"America/Anguilla" -14400;
+	"America/Antigua" -14400;
+	"America/Araguaina" -10800;
+	"America/Argentina/Buenos_Aires" -10800;
+	"America/Argentina/Catamarca" -10800;
+	"America/Argentina/ComodRivadavia" -10800;
+	"America/Argentina/Cordoba" -10800;
+	"America/Argentina/Jujuy" -10800;
+	"America/Argentina/La_Rioja" -10800;
+	"America/Argentina/Mendoza" -10800;
+	"America/Argentina/Rio_Gallegos" -10800;
+	"America/Argentina/Salta" -10800;
+	"America/Argentina/San_Juan" -10800;
+	"America/Argentina/San_Luis" -10800;
+	"America/Argentina/Tucuman" -10800;
+	"America/Argentina/Ushuaia" -10800;
+	"America/Aruba" -14400;
+	"America/Asuncion" -10800;
+	"America/Atikokan" -18000;
+	"America/Atka" -36000;
+	"America/Bahia" -10800;
+	"America/Bahia_Banderas" -21600;
+	"America/Barbados" -14400;
+	"America/Belem" -10800;
+	"America/Belize" -21600;
+	"America/Blanc-Sablon" -14400;
+	"America/Boa_Vista" -14400;
+	"America/Bogota" -18000;
+	"America/Boise" -25200;
+	"America/Buenos_Aires" -10800;
+	"America/Cambridge_Bay" -25200;
+	"America/Campo_Grande" -14400;
+	"America/Cancun" -18000;
+	"America/Caracas" -14400;
+	"America/Catamarca" -10800;
+	"America/Cayenne" -10800;
+	"America/Cayman" -18000;
+	"America/Chicago" -21600;
+	"America/Chihuahua" -25200;
+	"America/Coral_Harbour" -18000;
+	"America/Cordoba" -10800;
+	"America/Costa_Rica" -21600;
+	"America/Creston" -25200;
+	"America/Cuiaba" -14400;
+	"America/Curacao" -14400;
+	"America/Danmarkshavn" 0;
+	"America/Dawson" -28800;
+	"America/Dawson_Creek" -25200;
+	"America/Denver" -25200;
+	"America/Detroit" -18000;
+	"America/Dominica" -14400;
+	"America/Edmonton" -25200;
+	"America/Eirunepe" -18000;
+	"America/El_Salvador" -21600;
+	"America/Ensenada" -28800;
+	"America/Fort_Nelson" -25200;
+	"America/Fort_Wayne" -18000;
+	"America/Fortaleza" -10800;
+	"America/Glace_Bay" -14400;
+	"America/Godthab" -10800;
+	"America/Goose_Bay" -14400;
+	"America/Grand_Turk" -14400;
+	"America/Grenada" -14400;
+	"America/Guadeloupe" -14400;
+	"America/Guatemala" -21600;
+	"America/Guayaquil" -18000;
+	"America/Guyana" -14400;
+	"America/Halifax" -14400;
+	"America/Havana" -18000;
+	"America/Hermosillo" -25200;
+	"America/Indiana/Indianapolis" -18000;
+	"America/Indiana/Knox" -21600;
+	"America/Indiana/Marengo" -18000;
+	"America/Indiana/Petersburg" -18000;
+	"America/Indiana/Tell_City" -21600;
+	"America/Indiana/Vevay" -18000;
+	"America/Indiana/Vincennes" -18000;
+	"America/Indiana/Winamac" -18000;
+	"America/Indianapolis" -18000;
+	"America/Inuvik" -25200;
+	"America/Iqaluit" -18000;
+	"America/Jamaica" -18000;
+	"America/Jujuy" -10800;
+	"America/Juneau" -32400;
+	"America/Kentucky/Louisville" -18000;
+	"America/Kentucky/Monticello" -18000;
+	"America/Knox_IN" -21600;
+	"America/Kralendijk" -14400;
+	"America/La_Paz" -14400;
+	"America/Lima" -18000;
+	"America/Los_Angeles" -28800;
+	"America/Louisville" -18000;
+	"America/Lower_Princes" -14400;
+	"America/Maceio" -10800;
+	"America/Managua" -21600;
+	"America/Manaus" -14400;
+	"America/Marigot" -14400;
+	"America/Martinique" -14400;
+	"America/Matamoros" -21600;
+	"America/Mazatlan" -25200;
+	"America/Mendoza" -10800;
+	"America/Menominee" -21600;
+	"America/Merida" -21600;
+	"America/Metlakatla" -32400;
+	"America/Mexico_City" -21600;
+	"America/Miquelon" -10800;
+	"America/Moncton" -14400;
+	"America/Monterrey" -21600;
+	"America/Montevideo" -10800;
+	"America/Montreal" -18000;
+	"America/Montserrat" -14400;
+	"America/Nassau" -18000;
+	"America/New_York" -18000;
+	"America/Nipigon" -18000;
+	"America/Nome" -32400;
+	"America/Noronha" -7200;
+	"America/North_Dakota/Beulah" -21600;
+	"America/North_Dakota/Center" -21600;
+	"America/North_Dakota/New_Salem" -21600;
+	"America/Ojinaga" -25200;
+	"America/Panama" -18000;
+	"America/Pangnirtung" -18000;
+	"America/Paramaribo" -10800;
+	"America/Phoenix" -25200;
+	"America/Port-au-Prince" -18000;
+	"America/Port_of_Spain" -14400;
+	"America/Porto_Acre" -18000;
+	"America/Porto_Velho" -14400;
+	"America/Puerto_Rico" -14400;
+	"America/Punta_Arenas" -10800;
+	"America/Rainy_River" -21600;
+	"America/Rankin_Inlet" -21600;
+	"America/Recife" -10800;
+	"America/Regina" -21600;
+	"America/Resolute" -21600;
+	"America/Rio_Branco" -18000;
+	"America/Rosario" -10800;
+	"America/Santa_Isabel" -28800;
+	"America/Santarem" -10800;
+	"America/Santiago" -10800;
+	"America/Santo_Domingo" -14400;
+	"America/Sao_Paulo" -10800;
+	"America/Scoresbysund" -3600;
+	"America/Shiprock" -25200;
+	"America/Sitka" -32400;
+	"America/St_Barthelemy" -14400;
+	"America/St_Johns" -12600;
+	"America/St_Kitts" -14400;
+	"America/St_Lucia" -14400;
+	"America/St_Thomas" -14400;
+	"America/St_Vincent" -14400;
+	"America/Swift_Current" -21600;
+	"America/Tegucigalpa" -21600;
+	"America/Thule" -14400;
+	"America/Thunder_Bay" -18000;
+	"America/Tijuana" -28800;
+	"America/Toronto" -18000;
+	"America/Tortola" -14400;
+	"America/Vancouver" -28800;
+	"America/Virgin" -14400;
+	"America/Whitehorse" -28800;
+	"America/Winnipeg" -21600;
+	"America/Yakutat" -32400;
+	"America/Yellowknife" -25200;
+	"Antarctica/Casey" 39600;
+	"Antarctica/Davis" 25200;
+	"Antarctica/DumontDUrville" 36000;
+	"Antarctica/Macquarie" 39600;
+	"Antarctica/Mawson" 18000;
+	"Antarctica/McMurdo" 46800;
+	"Antarctica/Palmer" -10800;
+	"Antarctica/Rothera" -10800;
+	"Antarctica/South_Pole" 46800;
+	"Antarctica/Syowa" 10800;
+	"Antarctica/Troll" 0;
+	"Antarctica/Vostok" 21600;
+	"Arctic/Longyearbyen" 3600;
+	"Asia/Aden" 10800;
+	"Asia/Almaty" 21600;
+	"Asia/Amman" 7200;
+	"Asia/Anadyr" 43200;
+	"Asia/Aqtau" 18000;
+	"Asia/Aqtobe" 18000;
+	"Asia/Ashgabat" 18000;
+	"Asia/Ashkhabad" 18000;
+	"Asia/Atyrau" 18000;
+	"Asia/Baghdad" 10800;
+	"Asia/Bahrain" 10800;
+	"Asia/Baku" 14400;
+	"Asia/Bangkok" 25200;
+	"Asia/Barnaul" 25200;
+	"Asia/Beirut" 7200;
+	"Asia/Bishkek" 21600;
+	"Asia/Brunei" 28800;
+	"Asia/Calcutta" 19800;
+	"Asia/Chita" 32400;
+	"Asia/Choibalsan" 28800;
+	"Asia/Chongqing" 28800;
+	"Asia/Chungking" 28800;
+	"Asia/Colombo" 19800;
+	"Asia/Dacca" 21600;
+	"Asia/Damascus" 7200;
+	"Asia/Dhaka" 21600;
+	"Asia/Dili" 32400;
+	"Asia/Dubai" 14400;
+	"Asia/Dushanbe" 18000;
+	"Asia/Famagusta" 7200;
+	"Asia/Gaza" 7200;
+	"Asia/Harbin" 28800;
+	"Asia/Hebron" 7200;
+	"Asia/Ho_Chi_Minh" 25200;
+	"Asia/Hong_Kong" 28800;
+	"Asia/Hovd" 25200;
+	"Asia/Irkutsk" 28800;
+	"Asia/Istanbul" 10800;
+	"Asia/Jakarta" 25200;
+	"Asia/Jayapura" 32400;
+	"Asia/Jerusalem" 7200;
+	"Asia/Kabul" 16200;
+	"Asia/Kamchatka" 43200;
+	"Asia/Karachi" 18000;
+	"Asia/Kashgar" 21600;
+	"Asia/Kathmandu" 20700;
+	"Asia/Katmandu" 20700;
+	"Asia/Khandyga" 32400;
+	"Asia/Kolkata" 19800;
+	"Asia/Krasnoyarsk" 25200;
+	"Asia/Kuala_Lumpur" 28800;
+	"Asia/Kuching" 28800;
+	"Asia/Kuwait" 10800;
+	"Asia/Macao" 28800;
+	"Asia/Macau" 28800;
+	"Asia/Magadan" 39600;
+	"Asia/Makassar" 28800;
+	"Asia/Manila" 28800;
+	"Asia/Muscat" 14400;
+	"Asia/Nicosia" 7200;
+	"Asia/Novokuznetsk" 25200;
+	"Asia/Novosibirsk" 25200;
+	"Asia/Omsk" 21600;
+	"Asia/Oral" 18000;
+	"Asia/Phnom_Penh" 25200;
+	"Asia/Pontianak" 25200;
+	"Asia/Pyongyang" 30600;
+	"Asia/Qatar" 10800;
+	"Asia/Qyzylorda" 21600;
+	"Asia/Rangoon" 23400;
+	"Asia/Riyadh" 10800;
+	"Asia/Saigon" 25200;
+	"Asia/Sakhalin" 39600;
+	"Asia/Samarkand" 18000;
+	"Asia/Seoul" 32400;
+	"Asia/Shanghai" 28800;
+	"Asia/Singapore" 28800;
+	"Asia/Srednekolymsk" 39600;
+	"Asia/Taipei" 28800;
+	"Asia/Tashkent" 18000;
+	"Asia/Tbilisi" 14400;
+	"Asia/Tehran" 12600;
+	"Asia/Tel_Aviv" 7200;
+	"Asia/Thimbu" 21600;
+	"Asia/Thimphu" 21600;
+	"Asia/Tokyo" 32400;
+	"Asia/Tomsk" 25200;
+	"Asia/Ujung_Pandang" 28800;
+	"Asia/Ulaanbaatar" 28800;
+	"Asia/Ulan_Bator" 28800;
+	"Asia/Urumqi" 21600;
+	"Asia/Ust-Nera" 36000;
+	"Asia/Vientiane" 25200;
+	"Asia/Vladivostok" 36000;
+	"Asia/Yakutsk" 32400;
+	"Asia/Yangon" 23400;
+	"Asia/Yekaterinburg" 18000;
+	"Asia/Yerevan" 14400;
+	"Atlantic/Azores" -3600;
+	"Atlantic/Bermuda" -14400;
+	"Atlantic/Canary" 0;
+	"Atlantic/Cape_Verde" -3600;
+	"Atlantic/Faeroe" 0;
+	"Atlantic/Faroe" 0;
+	"Atlantic/Jan_Mayen" 3600;
+	"Atlantic/Madeira" 0;
+	"Atlantic/Reykjavik" 0;
+	"Atlantic/South_Georgia" -7200;
+	"Atlantic/St_Helena" 0;
+	"Atlantic/Stanley" -10800;
+	"Australia/ACT" 39600;
+	"Australia/Adelaide" 37800;
+	"Australia/Brisbane" 36000;
+	"Australia/Broken_Hill" 37800;
+	"Australia/Canberra" 39600;
+	"Australia/Currie" 39600;
+	"Australia/Darwin" 34200;
+	"Australia/Eucla" 31500;
+	"Australia/Hobart" 39600;
+	"Australia/LHI" 39600;
+	"Australia/Lindeman" 36000;
+	"Australia/Lord_Howe" 39600;
+	"Australia/Melbourne" 39600;
+	"Australia/NSW" 39600;
+	"Australia/North" 34200;
+	"Australia/Perth" 28800;
+	"Australia/Queensland" 36000;
+	"Australia/South" 37800;
+	"Australia/Sydney" 39600;
+	"Australia/Tasmania" 39600;
+	"Australia/Victoria" 39600;
+	"Australia/West" 28800;
+	"Australia/Yancowinna" 37800;
+	"Europe/Amsterdam" 3600;
+	"Europe/Andorra" 3600;
+	"Europe/Astrakhan" 14400;
+	"Europe/Athens" 7200;
+	"Europe/Belfast" 0;
+	"Europe/Belgrade" 3600;
+	"Europe/Berlin" 3600;
+	"Europe/Bratislava" 3600;
+	"Europe/Brussels" 3600;
+	"Europe/Bucharest" 7200;
+	"Europe/Budapest" 3600;
+	"Europe/Busingen" 3600;
+	"Europe/Chisinau" 7200;
+	"Europe/Copenhagen" 3600;
+	"Europe/Dublin" 0;
+	"Europe/Gibraltar" 3600;
+	"Europe/Guernsey" 0;
+	"Europe/Helsinki" 7200;
+	"Europe/Isle_of_Man" 0;
+	"Europe/Istanbul" 10800;
+	"Europe/Jersey" 0;
+	"Europe/Kaliningrad" 7200;
+	"Europe/Kiev" 7200;
+	"Europe/Kirov" 10800;
+	"Europe/Lisbon" 0;
+	"Europe/Ljubljana" 3600;
+	"Europe/London" 0;
+	"Europe/Luxembourg" 3600;
+	"Europe/Madrid" 3600;
+	"Europe/Malta" 3600;
+	"Europe/Mariehamn" 7200;
+	"Europe/Minsk" 10800;
+	"Europe/Monaco" 3600;
+	"Europe/Moscow" 10800;
+	"Europe/Nicosia" 7200;
+	"Europe/Oslo" 3600;
+	"Europe/Paris" 3600;
+	"Europe/Podgorica" 3600;
+	"Europe/Prague" 3600;
+	"Europe/Riga" 7200;
+	"Europe/Rome" 3600;
+	"Europe/Samara" 14400;
+	"Europe/San_Marino" 3600;
+	"Europe/Sarajevo" 3600;
+	"Europe/Saratov" 14400;
+	"Europe/Simferopol" 10800;
+	"Europe/Skopje" 3600;
+	"Europe/Sofia" 7200;
+	"Europe/Stockholm" 3600;
+	"Europe/Tallinn" 7200;
+	"Europe/Tirane" 3600;
+	"Europe/Tiraspol" 7200;
+	"Europe/Ulyanovsk" 14400;
+	"Europe/Uzhgorod" 7200;
+	"Europe/Vaduz" 3600;
+	"Europe/Vatican" 3600;
+	"Europe/Vienna" 3600;
+	"Europe/Vilnius" 7200;
+	"Europe/Volgograd" 10800;
+	"Europe/Warsaw" 3600;
+	"Europe/Zagreb" 3600;
+	"Europe/Zaporozhye" 7200;
+	"Europe/Zurich" 3600;
+	"Indian/Antananarivo" 10800;
+	"Indian/Chagos" 21600;
+	"Indian/Christmas" 25200;
+	"Indian/Cocos" 23400;
+	"Indian/Comoro" 10800;
+	"Indian/Kerguelen" 18000;
+	"Indian/Mahe" 14400;
+	"Indian/Maldives" 18000;
+	"Indian/Mauritius" 14400;
+	"Indian/Mayotte" 10800;
+	"Indian/Reunion" 14400;
+	"Pacific/Apia" 50400;
+	"Pacific/Auckland" 46800;
+	"Pacific/Bougainville" 39600;
+	"Pacific/Chatham" 49500;
+	"Pacific/Chuuk" 36000;
+	"Pacific/Easter" -18000;
+	"Pacific/Efate" 39600;
+	"Pacific/Enderbury" 46800;
+	"Pacific/Fakaofo" 46800;
+	"Pacific/Fiji" 43200;
+	"Pacific/Funafuti" 43200;
+	"Pacific/Galapagos" -21600;
+	"Pacific/Gambier" -32400;
+	"Pacific/Guadalcanal" 39600;
+	"Pacific/Guam" 36000;
+	"Pacific/Honolulu" -36000;
+	"Pacific/Johnston" -36000;
+	"Pacific/Kiritimati" 50400;
+	"Pacific/Kosrae" 39600;
+	"Pacific/Kwajalein" 43200;
+	"Pacific/Majuro" 43200;
+	"Pacific/Marquesas" -34200;
+	"Pacific/Midway" -39600;
+	"Pacific/Nauru" 43200;
+	"Pacific/Niue" -39600;
+	"Pacific/Norfolk" 39600;
+	"Pacific/Noumea" 39600;
+	"Pacific/Pago_Pago" -39600;
+	"Pacific/Palau" 32400;
+	"Pacific/Pitcairn" -28800;
+	"Pacific/Pohnpei" 39600;
+	"Pacific/Ponape" 39600;
+	"Pacific/Port_Moresby" 36000;
+	"Pacific/Rarotonga" -36000;
+	"Pacific/Saipan" 36000;
+	"Pacific/Samoa" -39600;
+	"Pacific/Tahiti" -36000;
+	"Pacific/Tarawa" 43200;
+	"Pacific/Tongatapu" 46800;
+	"Pacific/Truk" 36000;
+	"Pacific/Wake" 43200;
+	"Pacific/Wallis" 43200;
+	"Pacific/Yap" 36000;
+}

telize/tz-offset.lua

@@ -0,0 +1,515 @@
+#!/usr/bin/env lua
+--[[
+###############################################################################
+#                                                                             #
+# Telize 2.0.0                                                                #
+# Copyright (c) 2013-2018, Frederic Cambus                                    #
+# https://www.telize.com                                                      #
+#                                                                             #
+# Created: 2013-08-15                                                         #
+# Last Updated: 2018-03-15                                                    #
+#                                                                             #
+# Telize is released under the BSD 2-Clause license.                          #
+# See LICENSE file for details.                                               #
+#                                                                             #
+###############################################################################
+]]--
+
+local luatz = require "luatz"
+
+local timezones = {
+	"Africa/Abidjan",
+	"Africa/Accra",
+	"Africa/Addis_Ababa",
+	"Africa/Algiers",
+	"Africa/Asmara",
+	"Africa/Asmera",
+	"Africa/Bamako",
+	"Africa/Bangui",
+	"Africa/Banjul",
+	"Africa/Bissau",
+	"Africa/Blantyre",
+	"Africa/Brazzaville",
+	"Africa/Bujumbura",
+	"Africa/Cairo",
+	"Africa/Casablanca",
+	"Africa/Ceuta",
+	"Africa/Conakry",
+	"Africa/Dakar",
+	"Africa/Dar_es_Salaam",
+	"Africa/Djibouti",
+	"Africa/Douala",
+	"Africa/El_Aaiun",
+	"Africa/Freetown",
+	"Africa/Gaborone",
+	"Africa/Harare",
+	"Africa/Johannesburg",
+	"Africa/Juba",
+	"Africa/Kampala",
+	"Africa/Khartoum",
+	"Africa/Kigali",
+	"Africa/Kinshasa",
+	"Africa/Lagos",
+	"Africa/Libreville",
+	"Africa/Lome",
+	"Africa/Luanda",
+	"Africa/Lubumbashi",
+	"Africa/Lusaka",
+	"Africa/Malabo",
+	"Africa/Maputo",
+	"Africa/Maseru",
+	"Africa/Mbabane",
+	"Africa/Mogadishu",
+	"Africa/Monrovia",
+	"Africa/Nairobi",
+	"Africa/Ndjamena",
+	"Africa/Niamey",
+	"Africa/Nouakchott",
+	"Africa/Ouagadougou",
+	"Africa/Porto-Novo",
+	"Africa/Sao_Tome",
+	"Africa/Timbuktu",
+	"Africa/Tripoli",
+	"Africa/Tunis",
+	"Africa/Windhoek",
+	"America/Adak",
+	"America/Anchorage",
+	"America/Anguilla",
+	"America/Antigua",
+	"America/Araguaina",
+	"America/Argentina/Buenos_Aires",
+	"America/Argentina/Catamarca",
+	"America/Argentina/ComodRivadavia",
+	"America/Argentina/Cordoba",
+	"America/Argentina/Jujuy",
+	"America/Argentina/La_Rioja",
+	"America/Argentina/Mendoza",
+	"America/Argentina/Rio_Gallegos",
+	"America/Argentina/Salta",
+	"America/Argentina/San_Juan",
+	"America/Argentina/San_Luis",
+	"America/Argentina/Tucuman",
+	"America/Argentina/Ushuaia",
+	"America/Aruba",
+	"America/Asuncion",
+	"America/Atikokan",
+	"America/Atka",
+	"America/Bahia",
+	"America/Bahia_Banderas",
+	"America/Barbados",
+	"America/Belem",
+	"America/Belize",
+	"America/Blanc-Sablon",
+	"America/Boa_Vista",
+	"America/Bogota",
+	"America/Boise",
+	"America/Buenos_Aires",
+	"America/Cambridge_Bay",
+	"America/Campo_Grande",
+	"America/Cancun",
+	"America/Caracas",
+	"America/Catamarca",
+	"America/Cayenne",
+	"America/Cayman",
+	"America/Chicago",
+	"America/Chihuahua",
+	"America/Coral_Harbour",
+	"America/Cordoba",
+	"America/Costa_Rica",
+	"America/Creston",
+	"America/Cuiaba",
+	"America/Curacao",
+	"America/Danmarkshavn",
+	"America/Dawson",
+	"America/Dawson_Creek",
+	"America/Denver",
+	"America/Detroit",
+	"America/Dominica",
+	"America/Edmonton",
+	"America/Eirunepe",
+	"America/El_Salvador",
+	"America/Ensenada",
+	"America/Fort_Nelson",
+	"America/Fort_Wayne",
+	"America/Fortaleza",
+	"America/Glace_Bay",
+	"America/Godthab",
+	"America/Goose_Bay",
+	"America/Grand_Turk",
+	"America/Grenada",
+	"America/Guadeloupe",
+	"America/Guatemala",
+	"America/Guayaquil",
+	"America/Guyana",
+	"America/Halifax",
+	"America/Havana",
+	"America/Hermosillo",
+	"America/Indiana/Indianapolis",
+	"America/Indiana/Knox",
+	"America/Indiana/Marengo",
+	"America/Indiana/Petersburg",
+	"America/Indiana/Tell_City",
+	"America/Indiana/Vevay",
+	"America/Indiana/Vincennes",
+	"America/Indiana/Winamac",
+	"America/Indianapolis",
+	"America/Inuvik",
+	"America/Iqaluit",
+	"America/Jamaica",
+	"America/Jujuy",
+	"America/Juneau",
+	"America/Kentucky/Louisville",
+	"America/Kentucky/Monticello",
+	"America/Knox_IN",
+	"America/Kralendijk",
+	"America/La_Paz",
+	"America/Lima",
+	"America/Los_Angeles",
+	"America/Louisville",
+	"America/Lower_Princes",
+	"America/Maceio",
+	"America/Managua",
+	"America/Manaus",
+	"America/Marigot",
+	"America/Martinique",
+	"America/Matamoros",
+	"America/Mazatlan",
+	"America/Mendoza",
+	"America/Menominee",
+	"America/Merida",
+	"America/Metlakatla",
+	"America/Mexico_City",
+	"America/Miquelon",
+	"America/Moncton",
+	"America/Monterrey",
+	"America/Montevideo",
+	"America/Montreal",
+	"America/Montserrat",
+	"America/Nassau",
+	"America/New_York",
+	"America/Nipigon",
+	"America/Nome",
+	"America/Noronha",
+	"America/North_Dakota/Beulah",
+	"America/North_Dakota/Center",
+	"America/North_Dakota/New_Salem",
+	"America/Ojinaga",
+	"America/Panama",
+	"America/Pangnirtung",
+	"America/Paramaribo",
+	"America/Phoenix",
+	"America/Port-au-Prince",
+	"America/Port_of_Spain",
+	"America/Porto_Acre",
+	"America/Porto_Velho",
+	"America/Puerto_Rico",
+	"America/Punta_Arenas",
+	"America/Rainy_River",
+	"America/Rankin_Inlet",
+	"America/Recife",
+	"America/Regina",
+	"America/Resolute",
+	"America/Rio_Branco",
+	"America/Rosario",
+	"America/Santa_Isabel",
+	"America/Santarem",
+	"America/Santiago",
+	"America/Santo_Domingo",
+	"America/Sao_Paulo",
+	"America/Scoresbysund",
+	"America/Shiprock",
+	"America/Sitka",
+	"America/St_Barthelemy",
+	"America/St_Johns",
+	"America/St_Kitts",
+	"America/St_Lucia",
+	"America/St_Thomas",
+	"America/St_Vincent",
+	"America/Swift_Current",
+	"America/Tegucigalpa",
+	"America/Thule",
+	"America/Thunder_Bay",
+	"America/Tijuana",
+	"America/Toronto",
+	"America/Tortola",
+	"America/Vancouver",
+	"America/Virgin",
+	"America/Whitehorse",
+	"America/Winnipeg",
+	"America/Yakutat",
+	"America/Yellowknife",
+	"Antarctica/Casey",
+	"Antarctica/Davis",
+	"Antarctica/DumontDUrville",
+	"Antarctica/Macquarie",
+	"Antarctica/Mawson",
+	"Antarctica/McMurdo",
+	"Antarctica/Palmer",
+	"Antarctica/Rothera",
+	"Antarctica/South_Pole",
+	"Antarctica/Syowa",
+	"Antarctica/Troll",
+	"Antarctica/Vostok",
+	"Arctic/Longyearbyen",
+	"Asia/Aden",
+	"Asia/Almaty",
+	"Asia/Amman",
+	"Asia/Anadyr",
+	"Asia/Aqtau",
+	"Asia/Aqtobe",
+	"Asia/Ashgabat",
+	"Asia/Ashkhabad",
+	"Asia/Atyrau",
+	"Asia/Baghdad",
+	"Asia/Bahrain",
+	"Asia/Baku",
+	"Asia/Bangkok",
+	"Asia/Barnaul",
+	"Asia/Beirut",
+	"Asia/Bishkek",
+	"Asia/Brunei",
+	"Asia/Calcutta",
+	"Asia/Chita",
+	"Asia/Choibalsan",
+	"Asia/Chongqing",
+	"Asia/Chungking",
+	"Asia/Colombo",
+	"Asia/Dacca",
+	"Asia/Damascus",
+	"Asia/Dhaka",
+	"Asia/Dili",
+	"Asia/Dubai",
+	"Asia/Dushanbe",
+	"Asia/Famagusta",
+	"Asia/Gaza",
+	"Asia/Harbin",
+	"Asia/Hebron",
+	"Asia/Ho_Chi_Minh",
+	"Asia/Hong_Kong",
+	"Asia/Hovd",
+	"Asia/Irkutsk",
+	"Asia/Istanbul",
+	"Asia/Jakarta",
+	"Asia/Jayapura",
+	"Asia/Jerusalem",
+	"Asia/Kabul",
+	"Asia/Kamchatka",
+	"Asia/Karachi",
+	"Asia/Kashgar",
+	"Asia/Kathmandu",
+	"Asia/Katmandu",
+	"Asia/Khandyga",
+	"Asia/Kolkata",
+	"Asia/Krasnoyarsk",
+	"Asia/Kuala_Lumpur",
+	"Asia/Kuching",
+	"Asia/Kuwait",
+	"Asia/Macao",
+	"Asia/Macau",
+	"Asia/Magadan",
+	"Asia/Makassar",
+	"Asia/Manila",
+	"Asia/Muscat",
+	"Asia/Nicosia",
+	"Asia/Novokuznetsk",
+	"Asia/Novosibirsk",
+	"Asia/Omsk",
+	"Asia/Oral",
+	"Asia/Phnom_Penh",
+	"Asia/Pontianak",
+	"Asia/Pyongyang",
+	"Asia/Qatar",
+	"Asia/Qyzylorda",
+	"Asia/Rangoon",
+	"Asia/Riyadh",
+	"Asia/Saigon",
+	"Asia/Sakhalin",
+	"Asia/Samarkand",
+	"Asia/Seoul",
+	"Asia/Shanghai",
+	"Asia/Singapore",
+	"Asia/Srednekolymsk",
+	"Asia/Taipei",
+	"Asia/Tashkent",
+	"Asia/Tbilisi",
+	"Asia/Tehran",
+	"Asia/Tel_Aviv",
+	"Asia/Thimbu",
+	"Asia/Thimphu",
+	"Asia/Tokyo",
+	"Asia/Tomsk",
+	"Asia/Ujung_Pandang",
+	"Asia/Ulaanbaatar",
+	"Asia/Ulan_Bator",
+	"Asia/Urumqi",
+	"Asia/Ust-Nera",
+	"Asia/Vientiane",
+	"Asia/Vladivostok",
+	"Asia/Yakutsk",
+	"Asia/Yangon",
+	"Asia/Yekaterinburg",
+	"Asia/Yerevan",
+	"Atlantic/Azores",
+	"Atlantic/Bermuda",
+	"Atlantic/Canary",
+	"Atlantic/Cape_Verde",
+	"Atlantic/Faeroe",
+	"Atlantic/Faroe",
+	"Atlantic/Jan_Mayen",
+	"Atlantic/Madeira",
+	"Atlantic/Reykjavik",
+	"Atlantic/South_Georgia",
+	"Atlantic/St_Helena",
+	"Atlantic/Stanley",
+	"Australia/ACT",
+	"Australia/Adelaide",
+	"Australia/Brisbane",
+	"Australia/Broken_Hill",
+	"Australia/Canberra",
+	"Australia/Currie",
+	"Australia/Darwin",
+	"Australia/Eucla",
+	"Australia/Hobart",
+	"Australia/LHI",
+	"Australia/Lindeman",
+	"Australia/Lord_Howe",
+	"Australia/Melbourne",
+	"Australia/NSW",
+	"Australia/North",
+	"Australia/Perth",
+	"Australia/Queensland",
+	"Australia/South",
+	"Australia/Sydney",
+	"Australia/Tasmania",
+	"Australia/Victoria",
+	"Australia/West",
+	"Australia/Yancowinna",
+	"Europe/Amsterdam",
+	"Europe/Andorra",
+	"Europe/Astrakhan",
+	"Europe/Athens",
+	"Europe/Belfast",
+	"Europe/Belgrade",
+	"Europe/Berlin",
+	"Europe/Bratislava",
+	"Europe/Brussels",
+	"Europe/Bucharest",
+	"Europe/Budapest",
+	"Europe/Busingen",
+	"Europe/Chisinau",
+	"Europe/Copenhagen",
+	"Europe/Dublin",
+	"Europe/Gibraltar",
+	"Europe/Guernsey",
+	"Europe/Helsinki",
+	"Europe/Isle_of_Man",
+	"Europe/Istanbul",
+	"Europe/Jersey",
+	"Europe/Kaliningrad",
+	"Europe/Kiev",
+	"Europe/Kirov",
+	"Europe/Lisbon",
+	"Europe/Ljubljana",
+	"Europe/London",
+	"Europe/Luxembourg",
+	"Europe/Madrid",
+	"Europe/Malta",
+	"Europe/Mariehamn",
+	"Europe/Minsk",
+	"Europe/Monaco",
+	"Europe/Moscow",
+	"Europe/Nicosia",
+	"Europe/Oslo",
+	"Europe/Paris",
+	"Europe/Podgorica",
+	"Europe/Prague",
+	"Europe/Riga",
+	"Europe/Rome",
+	"Europe/Samara",
+	"Europe/San_Marino",
+	"Europe/Sarajevo",
+	"Europe/Saratov",
+	"Europe/Simferopol",
+	"Europe/Skopje",
+	"Europe/Sofia",
+	"Europe/Stockholm",
+	"Europe/Tallinn",
+	"Europe/Tirane",
+	"Europe/Tiraspol",
+	"Europe/Ulyanovsk",
+	"Europe/Uzhgorod",
+	"Europe/Vaduz",
+	"Europe/Vatican",
+	"Europe/Vienna",
+	"Europe/Vilnius",
+	"Europe/Volgograd",
+	"Europe/Warsaw",
+	"Europe/Zagreb",
+	"Europe/Zaporozhye",
+	"Europe/Zurich",
+	"Indian/Antananarivo",
+	"Indian/Chagos",
+	"Indian/Christmas",
+	"Indian/Cocos",
+	"Indian/Comoro",
+	"Indian/Kerguelen",
+	"Indian/Mahe",
+	"Indian/Maldives",
+	"Indian/Mauritius",
+	"Indian/Mayotte",
+	"Indian/Reunion",
+	"Pacific/Apia",
+	"Pacific/Auckland",
+	"Pacific/Bougainville",
+	"Pacific/Chatham",
+	"Pacific/Chuuk",
+	"Pacific/Easter",
+	"Pacific/Efate",
+	"Pacific/Enderbury",
+	"Pacific/Fakaofo",
+	"Pacific/Fiji",
+	"Pacific/Funafuti",
+	"Pacific/Galapagos",
+	"Pacific/Gambier",
+	"Pacific/Guadalcanal",
+	"Pacific/Guam",
+	"Pacific/Honolulu",
+	"Pacific/Johnston",
+	"Pacific/Kiritimati",
+	"Pacific/Kosrae",
+	"Pacific/Kwajalein",
+	"Pacific/Majuro",
+	"Pacific/Marquesas",
+	"Pacific/Midway",
+	"Pacific/Nauru",
+	"Pacific/Niue",
+	"Pacific/Norfolk",
+	"Pacific/Noumea",
+	"Pacific/Pago_Pago",
+	"Pacific/Palau",
+	"Pacific/Pitcairn",
+	"Pacific/Pohnpei",
+	"Pacific/Ponape",
+	"Pacific/Port_Moresby",
+	"Pacific/Rarotonga",
+	"Pacific/Saipan",
+	"Pacific/Samoa",
+	"Pacific/Tahiti",
+	"Pacific/Tarawa",
+	"Pacific/Tongatapu",
+	"Pacific/Truk",
+	"Pacific/Wake",
+	"Pacific/Wallis",
+	"Pacific/Yap"
+}
+
+local utcnow = luatz.time ()
+
+print("map $geoip2_timezone $geoip2_offset {")
+
+for loop, timezone in ipairs(timezones) do
+	print('\t"' .. timezone .. '" ' ..
+	    luatz.get_tz(timezone):find_current(utcnow).gmtoff .. ';')
+end
+
+print("}")

terraform/Dockerfile

@@ -13,7 +13,7 @@ RUN	apk add --no-cache \
 	musl-dev \
 	zip
 
-ENV TERRAFORM_VERSION v0.12.17
+ENV TERRAFORM_VERSION v0.12.28
 
 RUN go get github.com/hashicorp/terraform || true
 

tor-browser/alpha/Dockerfile

@@ -23,6 +23,7 @@ RUN apt-get update && apt-get install -y \
 	libx11-xcb1 \
 	libxt6 \
 	xz-utils \
+	file \
 	--no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
@@ -33,7 +34,7 @@ RUN useradd --create-home --home-dir $HOME user \
 ENV LANG C.UTF-8
 
 # https://www.torproject.org/download/alpha/
-ENV TOR_VERSION 9.5a3
+ENV TOR_VERSION 9.5a12
 ENV TOR_FINGERPRINT 0x4E2C6E8793298290
 
 # download tor and check signature

tor-browser/stable/Dockerfile

@@ -23,6 +23,7 @@ RUN apt-get update && apt-get install -y \
 	libx11-xcb1 \
 	libxt6 \
 	xz-utils \
+	file \
 	--no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
@@ -33,7 +34,7 @@ RUN useradd --create-home --home-dir $HOME user \
 ENV LANG C.UTF-8
 
 # https://www.torproject.org/projects/torbrowser.html.en
-ENV TOR_VERSION 9.0.2
+ENV TOR_VERSION 9.0.10
 ENV TOR_FINGERPRINT 0x4E2C6E8793298290
 
 # download tor and check signature

unifi/Dockerfile

@@ -40,7 +40,7 @@ RUN apt-get update && apt-get install -y \
 	&& rm -rf /var/lib/apt/lists/*
 
 # install gosu
-ENV GOSU_VERSION 1.11
+ENV GOSU_VERSION 1.12
 RUN set -ex; \
 	\
 	fetchDeps=' \
@@ -88,14 +88,14 @@ RUN apt-get update && apt-get install -y \
 
 # unifi version
 # From: https://www.ubnt.com/download/unifi/
-ENV UNIFI_VERSION "5.12.35"
+ENV UNIFI_VERSION "5.12.72"
 
 # install unifi
 RUN apt-get update && apt-get install -y \
 		curl \
 		--no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/* \
-	&& curl -o /tmp/unifi.deb -L "http://dl.ubnt.com/unifi/${UNIFI_VERSION}/unifi_sysvinit_all.deb" \
+	&& curl -o /tmp/unifi.deb -L "https://dl.ubnt.com/unifi/${UNIFI_VERSION}/unifi_sysvinit_all.deb" \
 	&& dpkg -i /tmp/unifi.deb \
 	&& rm -rf /tmp/unifi.deb \
 	&& echo "Build complete."

vagrant/Dockerfile

@@ -19,7 +19,7 @@ RUN	apt-get update && apt-get install -y \
 	--no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
-ENV	VAGRANT_VERSION 2.2.6
+ENV	VAGRANT_VERSION 2.2.9
 
 # download the source
 RUN curl -sSL "https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}_x86_64.deb" -o /tmp/vagrant-amd64.deb \

vault/Dockerfile

@@ -1,20 +1,34 @@
-FROM golang:alpine as builder
+FROM golang:latest as builder
 LABEL maintainer="Jessica Frazelle <jess@linux.com>"
 
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
 
-RUN	apk add --no-cache \
+RUN apt-get update && apt-get install -y \
-	--repository http://dl-cdn.alpinelinux.org/alpine/edge/main/ \
+	apt-transport-https \
-	bash \
 	ca-certificates \
-	git \
+	curl \
-	make \
+    --no-install-recommends \
-	npm \
+    && rm -rf /var/lib/apt/lists/* \
-	yarn \
+	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
-	zip
+	&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 
-ENV VAULT_VERSION v1.3.0
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
+
+RUN apt-get update && apt-get install -y \
+	gcc \
+	git \
+	g++ \
+	make \
+	nodejs \
+	pkgconf \
+	python \
+	yarn \
+	zip \
+    --no-install-recommends \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV VAULT_VERSION v1.4.2
 
 RUN go get github.com/hashicorp/vault || true
 

watchtower/Dockerfile

@@ -10,7 +10,7 @@ RUN apk --no-cache add \
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
 
-ENV WATCHTOWER_VERSION v0.3.9
+ENV WATCHTOWER_VERSION v1.0.2
 
 RUN git clone --depth 1 --branch ${WATCHTOWER_VERSION} https://github.com/containrrr/watchtower /go/src/github.com/containrrr/watchtower
 

weechat-matrix/Dockerfile

@@ -20,13 +20,13 @@ RUN apk add --no-cache \
 	libffi-dev \
 	libressl-dev \
 	olm-dev \
-	python \
+	python3 \
-	python-dev \
+	python3-dev \
-	py2-pip \
+	py3-pip \
 	weechat \
 	weechat-perl \
 	weechat-python \
-	--repository https://dl-4.alpinelinux.org/alpine/edge/testing
+	--repository https://dl-4.alpinelinux.org/alpine/edge/community
 
 ENV HOME /home/user
 
@@ -35,8 +35,8 @@ RUN adduser -S user -h $HOME \
 	&& cd $HOME \
 	&& git clone https://github.com/poljar/weechat-matrix.git \
 	&& cd weechat-matrix \
-	&& pip install -r requirements.txt \
+	&& pip3 install -r requirements.txt \
-	&& pip install websocket-client \
+	&& pip3 install websocket-client \
 	&& make install \
 	&& chown -R user $HOME
 

wireguard/install/Dockerfile

@@ -8,29 +8,34 @@
 # 	-v /usr/src:/usr/src:ro \
 # 	r.j3ss.co/wireguard:install
 #
-FROM alpine:latest
+FROM debian:sid-slim
 LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
-RUN apk add --no-cache \
+RUN apt update && apt -y install \
-	build-base \
+	build-essential \
 	ca-certificates \
-	elfutils-libelf \
+	git \
-	libmnl-dev
+	kmod \
+	libelf-dev \
+	libmnl-dev \
+	pkg-config \
+	--no-install-recommends \
+	&& rm -rf /var/lib/apt/lists/*
 
-# https://git.zx2c4.com/WireGuard/refs/
+# https://git.zx2c4.com/wireguard-linux-compat/
-ENV WIREGUARD_VERSION 0.0.20191205
+ENV WIREGUARD_VERSION v1.0.20200520
+# https://git.zx2c4.com/wireguard-tools
+ENV WIREGUARD_TOOLS_VERSION v1.0.20200513
 
 RUN set -x \
-	&& apk add --no-cache --virtual .build-deps \
+	&& git clone --depth 1 --branch "${WIREGUARD_VERSION}" https://git.zx2c4.com/wireguard-linux-compat.git /wireguard \
-		git \
+	&& git clone --depth 1 --branch "${WIREGUARD_TOOLS_VERSION}" https://git.zx2c4.com/wireguard-tools.git /wireguard-tools \
-	&& git clone --depth 1 --branch "${WIREGUARD_VERSION}" https://git.zx2c4.com/WireGuard.git /wireguard \
 	&& ( \
-		cd /wireguard/src \
+		cd /wireguard-tools/src \
-		&& make tools \
+		&& make -j$(nproc) \
-		&& make -C tools install \
+		&& make install \
-		&& make -C tools clean \
+		&& make clean \
-	) \
+	)
-	&& apk del .build-deps
 
 COPY entrypoint.sh /usr/local/bin/entrypoint.sh
 

wireguard/tools/Dockerfile

@@ -1,10 +1,12 @@
-FROM alpine:latest
+FROM debian:sid-slim
 
 LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
-RUN apk add --no-cache \
+RUN apt update && apt -y install \
 	ca-certificates \
-	libmnl
+	libmnl-dev \
+	--no-install-recommends \
+	&& rm -rf /var/lib/apt/lists/*
 
 COPY --from=r.j3ss.co/wireguard:install /usr/bin/wg /usr/bin/wg
 COPY --from=r.j3ss.co/wireguard:install /usr/share/man/man8/wg.8 /usr/share/man/man8/wg.8

znc/Dockerfile

@@ -22,7 +22,7 @@ RUN adduser -u 1001 -D user \
 
 ENV LANG C.UTF-8
 
-ENV ZNC_VERSION 1.7.5
+ENV ZNC_VERSION 1.8.1-rc1
 
 RUN set -x \
 	&& apk add --no-cache --virtual .build-deps \

zookeeper/3.6/Dockerfile

@@ -1,6 +1,6 @@
-FROM java:8-alpine
+FROM openjdk:8-alpine
 
-ENV ZOOKEEPER_VERSION 3.5.5
+ENV ZOOKEEPER_VERSION 3.6.1
 ENV PATH $PATH:/opt/zookeeper/bin/
 
 # the start files for zookeeper use bash
@@ -15,8 +15,8 @@ RUN buildDeps=' \
 	&& apk --no-cache add --virtual build-deps $buildDeps \
 	&& echo "==> Downloading Zookeeper..." \
 	&& mkdir -p /opt \
-	&& curl -sSL "http://apache.osuosl.org/zookeeper/zookeeper-${ZOOKEEPER_VERSION}/apache-zookeeper-${ZOOKEEPER_VERSION}.tar.gz" | tar -xzf - -C /opt \
+	&& curl -sSL "http://apache.osuosl.org/zookeeper/zookeeper-${ZOOKEEPER_VERSION}/apache-zookeeper-${ZOOKEEPER_VERSION}-bin.tar.gz" | tar -xzf - -C /opt \
-	&& mv /opt/apache-zookeeper-${ZOOKEEPER_VERSION} /opt/zookeeper \
+	&& mv /opt/apache-zookeeper-${ZOOKEEPER_VERSION}-bin /opt/zookeeper \
 	&& cp /opt/zookeeper/conf/zoo_sample.cfg /opt/zookeeper/conf/zoo.cfg \
 	&& apk del build-deps