update dockerfiles

Signed-off-by: Jess Frazelle <acidburn@github.com>
This commit is contained in:
Jess Frazelle 2019-03-08 11:09:18 -05:00
parent 1ff7b210cc
commit 01feb50dde
No known key found for this signature in database
GPG key ID: 18F3685C0022BFF3
9 changed files with 12 additions and 11 deletions

View file

@ -23,7 +23,7 @@ REGISTRY := r.j3ss.co
.PHONY: image .PHONY: image
image: ## Build a Dockerfile (ex. DIR=telnet). image: ## Build a Dockerfile (ex. DIR=telnet).
@:$(call check_defined, DIR, directory of the Dockefile) @:$(call check_defined, DIR, directory of the Dockefile)
docker build --rm --force-rm -t $(REGISTRY)/$(subst /,:,$(DIR)) ./$(DIR) docker build --rm --force-rm -t $(REGISTRY)/$(subst /,:,$(patsubst %/,%,$(DIR))) ./$(DIR)
.PHONY: test .PHONY: test
test: dockerfiles shellcheck ## Runs the tests on the repository. test: dockerfiles shellcheck ## Runs the tests on the repository.

View file

@ -1,7 +1,6 @@
FROM alpine:latest FROM alpine:latest
RUN apk --no-cache add \ RUN apk --no-cache add \
--repository http://dl-cdn.alpinelinux.org/alpine/latest-stable/community \
ca-certificates \ ca-certificates \
perl-datetime \ perl-datetime \
perl-timedate perl-timedate

View file

@ -1,6 +1,7 @@
package main package main
import ( import (
"context"
"crypto/tls" "crypto/tls"
"encoding/json" "encoding/json"
"errors" "errors"
@ -407,7 +408,7 @@ func inc(ip net.IP) {
func sendEmail(uri, ip string, port int, arinInfo ARINResponse) error { func sendEmail(uri, ip string, port int, arinInfo ARINResponse) error {
mailgunClient := mailgun.NewMailgun(mailgunDomain, mailgunAPIKey) mailgunClient := mailgun.NewMailgun(mailgunDomain, mailgunAPIKey)
msg, _, err := mailgunClient.Send(mailgunClient.NewMessage( msg, _, err := mailgunClient.Send(context.Background(), mailgunClient.NewMessage(
/* From */ fmt.Sprintf("%s <%s>", emailSender, emailSender), /* From */ fmt.Sprintf("%s <%s>", emailSender, emailSender),
/* Subject */ fmt.Sprintf("[k8scan]: found dashboard %s", uri), /* Subject */ fmt.Sprintf("[k8scan]: found dashboard %s", uri),
/* Body */ fmt.Sprintf(`Time: %s /* Body */ fmt.Sprintf(`Time: %s

View file

@ -26,7 +26,7 @@ ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
keepass2 \ keepass2 \
xdotool \ xdotool \
mono-dmcs \ mono-mcs \
--no-install-recommends \ --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

View file

@ -9,6 +9,7 @@ RUN apk add --no-cache \
ca-certificates \ ca-certificates \
gcc \ gcc \
git \ git \
g++ \
libgcc \ libgcc \
linux-headers \ linux-headers \
make \ make \

View file

@ -14,9 +14,9 @@ RUN apk add --no-cache \
--repository https://dl-4.alpinelinux.org/alpine/edge/testing --repository https://dl-4.alpinelinux.org/alpine/edge/testing
# https://github.com/Radarr/Radarr/releases # https://github.com/Radarr/Radarr/releases
ENV RADARR_VERSION v0.2.0.1293 ENV RADARR_VERSION 0.2.0.1293
RUN mkdir -p /opt/radarr \ RUN mkdir -p /opt/radarr \
&& wget "https://github.com/Radarr/Radarr/releases/download/${RADARR_VERSION}/Radarr.${RADARR_VERSION}.linux.tar.gz" -O /tmp/radarr.tar.gz \ && wget "https://github.com/Radarr/Radarr/releases/download/v${RADARR_VERSION}/Radarr.develop.${RADARR_VERSION}.linux.tar.gz" -O /tmp/radarr.tar.gz \
&& tar -xzvf /tmp/radarr.tar.gz -C /opt/radarr --strip-components 1 \ && tar -xzvf /tmp/radarr.tar.gz -C /opt/radarr --strip-components 1 \
&& rm -rf /tmp/radarr.tar.gz && rm -rf /tmp/radarr.tar.gz

View file

@ -33,7 +33,7 @@ RUN useradd --create-home --home-dir $HOME user \
ENV LANG C.UTF-8 ENV LANG C.UTF-8
# https://www.torproject.org/projects/torbrowser.html.en # https://www.torproject.org/projects/torbrowser.html.en
ENV TOR_VERSION 8.5a6 ENV TOR_VERSION 8.5a8
ENV TOR_FINGERPRINT 0x4E2C6E8793298290 ENV TOR_FINGERPRINT 0x4E2C6E8793298290
# download tor and check signature # download tor and check signature

View file

@ -1,6 +1,6 @@
FROM openjdk:8-alpine FROM openjdk:8-alpine
ENV ZOOKEEPER_VERSION 3.4.12 ENV ZOOKEEPER_VERSION 3.4.13
ENV PATH $PATH:/opt/zookeeper/bin/ ENV PATH $PATH:/opt/zookeeper/bin/
# the start files for zookeeper use bash # the start files for zookeeper use bash
@ -14,7 +14,7 @@ RUN buildDeps=' \
&& apk --no-cache add --virtual build-deps $buildDeps \ && apk --no-cache add --virtual build-deps $buildDeps \
&& echo "==> Downloading Zookeeper..." \ && echo "==> Downloading Zookeeper..." \
&& mkdir -p /opt \ && mkdir -p /opt \
&& curl -sSL "http://apache.mirrors.pair.com/zookeeper/zookeeper-${ZOOKEEPER_VERSION}/zookeeper-${ZOOKEEPER_VERSION}.tar.gz" | tar -xzf - -C /opt \ && curl -sSL "http://apache.osuosl.org/zookeeper/zookeeper-${ZOOKEEPER_VERSION}/zookeeper-${ZOOKEEPER_VERSION}.tar.gz" | tar -xzf - -C /opt \
&& mv /opt/zookeeper-${ZOOKEEPER_VERSION} /opt/zookeeper \ && mv /opt/zookeeper-${ZOOKEEPER_VERSION} /opt/zookeeper \
&& cp /opt/zookeeper/conf/zoo_sample.cfg /opt/zookeeper/conf/zoo.cfg \ && cp /opt/zookeeper/conf/zoo_sample.cfg /opt/zookeeper/conf/zoo.cfg \
&& apk del build-deps && apk del build-deps

View file

@ -1,6 +1,6 @@
FROM java:8-alpine FROM java:8-alpine
ENV ZOOKEEPER_VERSION 3.5.4 ENV ZOOKEEPER_VERSION 3.5.4-beta
ENV PATH $PATH:/opt/zookeeper/bin/ ENV PATH $PATH:/opt/zookeeper/bin/
# the start files for zookeeper use bash # the start files for zookeeper use bash
@ -15,7 +15,7 @@ RUN buildDeps=' \
&& apk --no-cache add --virtual build-deps $buildDeps \ && apk --no-cache add --virtual build-deps $buildDeps \
&& echo "==> Downloading Zookeeper..." \ && echo "==> Downloading Zookeeper..." \
&& mkdir -p /opt \ && mkdir -p /opt \
&& curl -sSL "http://apache.mirrors.pair.com/zookeeper/zookeeper-${ZOOKEEPER_VERSION}/zookeeper-${ZOOKEEPER_VERSION}.tar.gz" | tar -xzf - -C /opt \ && curl -sSL "http://apache.osuosl.org/zookeeper/zookeeper-${ZOOKEEPER_VERSION}/zookeeper-${ZOOKEEPER_VERSION}.tar.gz" | tar -xzf - -C /opt \
&& mv /opt/zookeeper-${ZOOKEEPER_VERSION} /opt/zookeeper \ && mv /opt/zookeeper-${ZOOKEEPER_VERSION} /opt/zookeeper \
&& cp /opt/zookeeper/conf/zoo_sample.cfg /opt/zookeeper/conf/zoo.cfg \ && cp /opt/zookeeper/conf/zoo_sample.cfg /opt/zookeeper/conf/zoo.cfg \
&& apk del build-deps && apk del build-deps