update versions and irssi plugins

Signed-off-by: Jess Frazelle <acidburn@google.com>
This commit is contained in:
Jess Frazelle 2016-12-27 16:34:48 -08:00
parent 4f8782ed19
commit 996f7a6367
No known key found for this signature in database
GPG Key ID: 18F3685C0022BFF3
4 changed files with 14 additions and 8 deletions

View File

@ -8,7 +8,7 @@ RUN apk --no-cache add \
py-boto \ py-boto \
py-paramiko 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 \ && cd /usr/src/beeswithmachineguns \
&& python setup.py install \ && python setup.py install \
&& rm -rf /usr/src/beeswithmachineguns && rm -rf /usr/src/beeswithmachineguns

View File

@ -1,7 +1,10 @@
FROM alpine:latest FROM alpine:latest
RUN apk --no-cache add \ 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 ENV HOME /home/user
RUN adduser -u 1001 -D user \ RUN adduser -u 1001 -D user \
@ -12,8 +15,7 @@ ENV LANG C.UTF-8
ENV IRSSI_VERSION 0.8.20 ENV IRSSI_VERSION 0.8.20
ENV LIB_OTR_VERSION 4.1.1 ENV LIB_OTR_VERSION 4.1.1
ENV IRSSI_OTR_VERSION 1.0.1 ENV IRSSI_OTR_VERSION 1.0.2
ENV PATCH_FOR_IRSSI_OTR https://github.com/cryptodotis/irssi-otr/commit/d03ab59b6f27142c1c5e99fedc635a589b1607bb.diff
RUN set -x \ RUN set -x \
&& apk add --no-cache --virtual .build-deps \ && apk add --no-cache --virtual .build-deps \
@ -30,7 +32,6 @@ RUN set -x \
make \ make \
ncurses-dev \ ncurses-dev \
openssl-dev \ openssl-dev \
patch \
perl-dev \ perl-dev \
pkgconf \ pkgconf \
tar \ tar \
@ -81,8 +82,6 @@ RUN set -x \
&& rm /tmp/irssi-otr.tar.gz \ && rm /tmp/irssi-otr.tar.gz \
&& ( \ && ( \
cd /usr/src/irssi-otr \ cd /usr/src/irssi-otr \
&& curl -sSL "$PATCH_FOR_IRSSI_OTR" -o patch.diff \
&& patch -p1 < patch.diff \
&& ./bootstrap \ && ./bootstrap \
&& ./configure \ && ./configure \
--prefix=/usr \ --prefix=/usr \

View File

@ -25,6 +25,10 @@ get_latest() {
local tag=$(echo $resp | jq --raw-output .[0].name) local tag=$(echo $resp | jq --raw-output .[0].name)
fi fi
if [[ "$name" == "null" ]]; then
name="-"
fi
local dir=${repo#*/} local dir=${repo#*/}
if [[ "$dir" == "CouchPotatoServer" ]]; then if [[ "$dir" == "CouchPotatoServer" ]]; then
@ -46,6 +50,7 @@ atom/atom
camlistore/camlistore camlistore/camlistore
CouchPotato/CouchPotatoServer CouchPotato/CouchPotatoServer
curl/curl curl/curl
fcambus/telize
hashicorp/consul hashicorp/consul
hashicorp/vault hashicorp/vault
irssi/irssi irssi/irssi

View File

@ -25,6 +25,8 @@ COPY telize.conf /etc/nginx/conf.d/telize.conf
EXPOSE 80 443 EXPOSE 80 443
ENV TELIZE_VERSION 1.07
RUN buildDeps=' \ RUN buildDeps=' \
curl \ curl \
git \ 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://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 \ && 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 \ && 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 \ && cd /usr/src/telize \
&& cp timezone*.conf /etc/nginx/ \ && cp timezone*.conf /etc/nginx/ \
&& rm -rf /usr/src/telize \ && rm -rf /usr/src/telize \