diff --git a/beeswithmachineguns/Dockerfile b/beeswithmachineguns/Dockerfile index ef4d0c1..a687086 100644 --- a/beeswithmachineguns/Dockerfile +++ b/beeswithmachineguns/Dockerfile @@ -8,7 +8,7 @@ RUN apk --no-cache add \ py-boto \ py-paramiko -RUN git clone https://github.com/newsapps/beeswithmachineguns /usr/src/beeswithmachineguns \ +RUN git clone --depth 1 https://github.com/newsapps/beeswithmachineguns /usr/src/beeswithmachineguns \ && cd /usr/src/beeswithmachineguns \ && python setup.py install \ && rm -rf /usr/src/beeswithmachineguns diff --git a/irssi/Dockerfile b/irssi/Dockerfile index 2711ef4..548521a 100644 --- a/irssi/Dockerfile +++ b/irssi/Dockerfile @@ -1,7 +1,10 @@ FROM alpine:latest RUN apk --no-cache add \ - ca-certificates + --repository https://dl-3.alpinelinux.org/alpine/latest-stable/community \ + ca-certificates \ + perl-datetime \ + perl-timedate ENV HOME /home/user RUN adduser -u 1001 -D user \ @@ -12,8 +15,7 @@ ENV LANG C.UTF-8 ENV IRSSI_VERSION 0.8.20 ENV LIB_OTR_VERSION 4.1.1 -ENV IRSSI_OTR_VERSION 1.0.1 -ENV PATCH_FOR_IRSSI_OTR https://github.com/cryptodotis/irssi-otr/commit/d03ab59b6f27142c1c5e99fedc635a589b1607bb.diff +ENV IRSSI_OTR_VERSION 1.0.2 RUN set -x \ && apk add --no-cache --virtual .build-deps \ @@ -30,7 +32,6 @@ RUN set -x \ make \ ncurses-dev \ openssl-dev \ - patch \ perl-dev \ pkgconf \ tar \ @@ -81,8 +82,6 @@ RUN set -x \ && rm /tmp/irssi-otr.tar.gz \ && ( \ cd /usr/src/irssi-otr \ - && curl -sSL "$PATCH_FOR_IRSSI_OTR" -o patch.diff \ - && patch -p1 < patch.diff \ && ./bootstrap \ && ./configure \ --prefix=/usr \ diff --git a/latest-versions.sh b/latest-versions.sh index a3c24a3..46d93ad 100755 --- a/latest-versions.sh +++ b/latest-versions.sh @@ -25,6 +25,10 @@ get_latest() { local tag=$(echo $resp | jq --raw-output .[0].name) fi + if [[ "$name" == "null" ]]; then + name="-" + fi + local dir=${repo#*/} if [[ "$dir" == "CouchPotatoServer" ]]; then @@ -46,6 +50,7 @@ atom/atom camlistore/camlistore CouchPotato/CouchPotatoServer curl/curl +fcambus/telize hashicorp/consul hashicorp/vault irssi/irssi diff --git a/telize/Dockerfile b/telize/Dockerfile index d9ffc8c..2289596 100644 --- a/telize/Dockerfile +++ b/telize/Dockerfile @@ -25,6 +25,8 @@ COPY telize.conf /etc/nginx/conf.d/telize.conf EXPOSE 80 443 +ENV TELIZE_VERSION 1.07 + RUN buildDeps=' \ curl \ git \ @@ -37,7 +39,7 @@ RUN buildDeps=' \ && curl -sSL http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz -o /usr/share/GeoIP/GeoLiteCity.dat.gz \ && curl -sSL http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz -o /usr/share/GeoIP/GeoIPASNum.dat.gz \ && gunzip /usr/share/GeoIP/*gz \ - && git clone https://github.com/fcambus/telize.git /usr/src/telize \ + && git clone --branch "${TELIZE_VERSION}" https://github.com/fcambus/telize.git /usr/src/telize \ && cd /usr/src/telize \ && cp timezone*.conf /etc/nginx/ \ && rm -rf /usr/src/telize \