mirror of
https://github.com/jessfraz/dockerfiles.git
synced 2024-11-23 11:31:49 +01:00
update base images
Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
This commit is contained in:
parent
6356143a7e
commit
c174139071
|
@ -1,36 +1,28 @@
|
||||||
FROM debian:jessie-slim
|
FROM alpine:latest
|
||||||
LABEL maintainer "Jessie Frazelle <jess@linux.com>"
|
LABEL maintainer "Jessie Frazelle <jess@linux.com>"
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apk add --no-cache \
|
||||||
libgmp10 \
|
ca-certificates
|
||||||
libgomp1 \
|
|
||||||
libkrb5-3 \
|
|
||||||
libnss3 \
|
|
||||||
libssl1.0.0 \
|
|
||||||
openssl \
|
|
||||||
--no-install-recommends \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
RUN buildDeps=' \
|
RUN set -x \
|
||||||
ca-certificates \
|
&& apk add --no-cache --virtual .build-deps \
|
||||||
|
build-base \
|
||||||
gcc \
|
gcc \
|
||||||
git \
|
git \
|
||||||
libgmp-dev \
|
gmp-dev \
|
||||||
libkrb5-dev \
|
krb5-dev \
|
||||||
libnss3-dev \
|
libressl-dev \
|
||||||
libssl-dev \
|
|
||||||
make \
|
make \
|
||||||
' \
|
perl \
|
||||||
&& set -x \
|
|
||||||
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
|
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
|
||||||
&& git clone --depth 1 https://github.com/magnumripper/JohnTheRipper.git /usr/src/johntheripper \
|
&& git clone --depth 1 https://github.com/magnumripper/JohnTheRipper.git /usr/src/johntheripper \
|
||||||
&& cd /usr/src/johntheripper/src \
|
&& ( \
|
||||||
&& ./configure || cat config.log \
|
cd /usr/src/johntheripper/src \
|
||||||
&& make \
|
&& ./configure || cat config.log \
|
||||||
&& cp -r ../run/* /usr/local/bin/ \
|
&& make \
|
||||||
|
&& cp -r ../run/* /usr/local/bin/ \
|
||||||
|
) \
|
||||||
&& rm -rf /usr/src/johntheripper \
|
&& rm -rf /usr/src/johntheripper \
|
||||||
&& apt-get purge -y --auto-remove $buildDeps
|
&& apk del .build-deps
|
||||||
|
|
||||||
COPY john.ini /root/john.ini
|
COPY john.ini /root/john.ini
|
||||||
COPY passwd.lst /root/passwd.lst
|
COPY passwd.lst /root/passwd.lst
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
# -e DISPLAY=unix$DISPLAY \
|
# -e DISPLAY=unix$DISPLAY \
|
||||||
# jess/keepassxc
|
# jess/keepassxc
|
||||||
#
|
#
|
||||||
FROM alpine:edge
|
FROM alpine:latest
|
||||||
LABEL maintainer "Christian Koep <christiankoep@gmail.com>"
|
LABEL maintainer "Christian Koep <christiankoep@gmail.com>"
|
||||||
|
|
||||||
ENV KEEPASSXC_VERSION 2.3.4
|
ENV KEEPASSXC_VERSION 2.3.4
|
||||||
|
@ -31,6 +31,7 @@ RUN buildDeps=' \
|
||||||
set -x \
|
set -x \
|
||||||
&& apk --no-cache add \
|
&& apk --no-cache add \
|
||||||
$buildDeps \
|
$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 \
|
&& git clone --depth 1 --branch ${KEEPASSXC_VERSION} https://github.com/keepassxreboot/keepassxc.git /usr/src/keepassxc \
|
||||||
&& cd /usr/src/keepassxc \
|
&& cd /usr/src/keepassxc \
|
||||||
&& mkdir build \
|
&& mkdir build \
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
# --name mutt \
|
# --name mutt \
|
||||||
# jess/mutt
|
# jess/mutt
|
||||||
#
|
#
|
||||||
FROM alpine:edge
|
FROM alpine:latest
|
||||||
LABEL maintainer "Jessie Frazelle <jess@linux.com>"
|
LABEL maintainer "Jessie Frazelle <jess@linux.com>"
|
||||||
|
|
||||||
RUN addgroup -g 1000 user \
|
RUN addgroup -g 1000 user \
|
||||||
|
@ -22,7 +22,8 @@ RUN apk --no-cache add \
|
||||||
lynx \
|
lynx \
|
||||||
mutt \
|
mutt \
|
||||||
mutt-doc \
|
mutt-doc \
|
||||||
vim
|
vim \
|
||||||
|
--repository https://dl-3.alpinelinux.org/alpine/edge/main
|
||||||
|
|
||||||
# a browser is necessary!
|
# a browser is necessary!
|
||||||
ENV BROWSER lynx
|
ENV BROWSER lynx
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM alpine:edge
|
FROM alpine:latest
|
||||||
|
|
||||||
RUN apk add --no-cache \
|
RUN apk add --no-cache \
|
||||||
bash \
|
bash \
|
||||||
|
@ -7,7 +7,8 @@ RUN apk add --no-cache \
|
||||||
mailx \
|
mailx \
|
||||||
postfix \
|
postfix \
|
||||||
rsyslog \
|
rsyslog \
|
||||||
runit
|
runit \
|
||||||
|
--repository https://dl-3.alpinelinux.org/alpine/edge/main
|
||||||
|
|
||||||
COPY service /etc/service
|
COPY service /etc/service
|
||||||
COPY runit_bootstrap /usr/sbin/runit_bootstrap
|
COPY runit_bootstrap /usr/sbin/runit_bootstrap
|
||||||
|
|
Loading…
Reference in New Issue
Block a user