From a9164b6a717874e3858d6eb2f25a812e35137e8e Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Fri, 15 May 2020 01:38:47 -0700 Subject: [PATCH] update Signed-off-by: Jess Frazelle --- fontpatcher/Dockerfile | 2 +- kvm/Dockerfile | 1 - mailman/Dockerfile | 26 ------------------- mailman/lighttpd.conf | 48 ------------------------------------ mailman/supervisord.conf | 11 --------- metasploit/Dockerfile | 11 --------- metasploit/start.sh | 15 ----------- nomad/Dockerfile | 3 +-- perkeep/Dockerfile | 2 +- tor-browser/alpha/Dockerfile | 2 +- 10 files changed, 4 insertions(+), 117 deletions(-) delete mode 100644 mailman/Dockerfile delete mode 100644 mailman/lighttpd.conf delete mode 100644 mailman/supervisord.conf delete mode 100644 metasploit/Dockerfile delete mode 100755 metasploit/start.sh diff --git a/fontpatcher/Dockerfile b/fontpatcher/Dockerfile index c727227..2aed6fb 100644 --- a/fontpatcher/Dockerfile +++ b/fontpatcher/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim +FROM debian:sid-slim LABEL maintainer "Jessie Frazelle " RUN apt-get update && apt-get install -y \ diff --git a/kvm/Dockerfile b/kvm/Dockerfile index bd6acb4..d0995cd 100644 --- a/kvm/Dockerfile +++ b/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 \ diff --git a/mailman/Dockerfile b/mailman/Dockerfile deleted file mode 100644 index a10b4a0..0000000 --- a/mailman/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM debian:bullseye-slim -LABEL maintainer "Jessie Frazelle " - -# 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" ] diff --git a/mailman/lighttpd.conf b/mailman/lighttpd.conf deleted file mode 100644 index fb67a23..0000000 --- a/mailman/lighttpd.conf +++ /dev/null @@ -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" => "") - diff --git a/mailman/supervisord.conf b/mailman/supervisord.conf deleted file mode 100644 index 9429796..0000000 --- a/mailman/supervisord.conf +++ /dev/null @@ -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 diff --git a/metasploit/Dockerfile b/metasploit/Dockerfile deleted file mode 100644 index 0b7bfe8..0000000 --- a/metasploit/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM r.j3ss.co/kalilinux -LABEL maintainer "Christian Koep " - -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" ] diff --git a/metasploit/start.sh b/metasploit/start.sh deleted file mode 100755 index e40608a..0000000 --- a/metasploit/start.sh +++ /dev/null @@ -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 diff --git a/nomad/Dockerfile b/nomad/Dockerfile index 73281d1..2a71717 100644 --- a/nomad/Dockerfile +++ b/nomad/Dockerfile @@ -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 \ diff --git a/perkeep/Dockerfile b/perkeep/Dockerfile index a7411a8..a00386b 100644 --- a/perkeep/Dockerfile +++ b/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/ \ diff --git a/tor-browser/alpha/Dockerfile b/tor-browser/alpha/Dockerfile index 62dd640..584d421 100644 --- a/tor-browser/alpha/Dockerfile +++ b/tor-browser/alpha/Dockerfile @@ -34,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.5a8 +ENV TOR_VERSION 9.5a12 ENV TOR_FINGERPRINT 0x4E2C6E8793298290 # download tor and check signature