From c174139071b35a9a3bf25ef94d8e32f93fa0db64 Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Fri, 14 Sep 2018 11:48:08 -0400 Subject: [PATCH] update base images Signed-off-by: Jess Frazelle --- john/Dockerfile | 42 +++++++++++++++++------------------------- keepassxc/Dockerfile | 3 ++- mutt/Dockerfile | 5 +++-- postfix/Dockerfile | 5 +++-- 4 files changed, 25 insertions(+), 30 deletions(-) diff --git a/john/Dockerfile b/john/Dockerfile index 6987ada..59ab89c 100644 --- a/john/Dockerfile +++ b/john/Dockerfile @@ -1,36 +1,28 @@ -FROM debian:jessie-slim +FROM alpine:latest LABEL maintainer "Jessie Frazelle " -RUN apt-get update && apt-get install -y \ - libgmp10 \ - libgomp1 \ - libkrb5-3 \ - libnss3 \ - libssl1.0.0 \ - openssl \ - --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* +RUN apk add --no-cache \ + ca-certificates -RUN buildDeps=' \ - ca-certificates \ +RUN set -x \ + && apk add --no-cache --virtual .build-deps \ + build-base \ gcc \ git \ - libgmp-dev \ - libkrb5-dev \ - libnss3-dev \ - libssl-dev \ + gmp-dev \ + krb5-dev \ + libressl-dev \ make \ - ' \ - && set -x \ - && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ + perl \ && git clone --depth 1 https://github.com/magnumripper/JohnTheRipper.git /usr/src/johntheripper \ - && cd /usr/src/johntheripper/src \ - && ./configure || cat config.log \ - && make \ - && cp -r ../run/* /usr/local/bin/ \ + && ( \ + cd /usr/src/johntheripper/src \ + && ./configure || cat config.log \ + && make \ + && cp -r ../run/* /usr/local/bin/ \ + ) \ && rm -rf /usr/src/johntheripper \ - && apt-get purge -y --auto-remove $buildDeps + && apk del .build-deps COPY john.ini /root/john.ini COPY passwd.lst /root/passwd.lst diff --git a/keepassxc/Dockerfile b/keepassxc/Dockerfile index 7e79f98..e58f165 100644 --- a/keepassxc/Dockerfile +++ b/keepassxc/Dockerfile @@ -8,7 +8,7 @@ # -e DISPLAY=unix$DISPLAY \ # jess/keepassxc # -FROM alpine:edge +FROM alpine:latest LABEL maintainer "Christian Koep " ENV KEEPASSXC_VERSION 2.3.4 @@ -31,6 +31,7 @@ RUN buildDeps=' \ set -x \ && apk --no-cache add \ $buildDeps \ + --repository https://dl-3.alpinelinux.org/alpine/edge/main \ && git clone --depth 1 --branch ${KEEPASSXC_VERSION} https://github.com/keepassxreboot/keepassxc.git /usr/src/keepassxc \ && cd /usr/src/keepassxc \ && mkdir build \ diff --git a/mutt/Dockerfile b/mutt/Dockerfile index 12c697d..b6afab3 100644 --- a/mutt/Dockerfile +++ b/mutt/Dockerfile @@ -8,7 +8,7 @@ # --name mutt \ # jess/mutt # -FROM alpine:edge +FROM alpine:latest LABEL maintainer "Jessie Frazelle " RUN addgroup -g 1000 user \ @@ -22,7 +22,8 @@ RUN apk --no-cache add \ lynx \ mutt \ mutt-doc \ - vim + vim \ + --repository https://dl-3.alpinelinux.org/alpine/edge/main # a browser is necessary! ENV BROWSER lynx diff --git a/postfix/Dockerfile b/postfix/Dockerfile index df8ba0f..054532e 100644 --- a/postfix/Dockerfile +++ b/postfix/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:edge +FROM alpine:latest RUN apk add --no-cache \ bash \ @@ -7,7 +7,8 @@ RUN apk add --no-cache \ mailx \ postfix \ rsyslog \ - runit + runit \ + --repository https://dl-3.alpinelinux.org/alpine/edge/main COPY service /etc/service COPY runit_bootstrap /usr/sbin/runit_bootstrap