From 0c2e49733ee8eaffb5cd2005aac84ca49d0e1e86 Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Mon, 19 Sep 2016 13:08:09 -0700 Subject: [PATCH] cleanup Signed-off-by: Jess Frazelle --- afterthedeadline/Dockerfile | 16 +++++++--------- cf-reset-cache/Dockerfile | 10 ++++------ zookeeper/Dockerfile | 2 +- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/afterthedeadline/Dockerfile b/afterthedeadline/Dockerfile index b62b41f..aeb6160 100644 --- a/afterthedeadline/Dockerfile +++ b/afterthedeadline/Dockerfile @@ -1,22 +1,20 @@ -FROM debian:wheezy +FROM java:7-alpine MAINTAINER Jessica Frazelle -EXPOSE 1049 - -RUN apt-get update && apt-get install -y \ +RUN apk add --no-cache \ ca-certificates \ curl \ - openjdk-6-jre \ - --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* + tar ENV LANG C.UTF-8 +ENV ATD_VERSION 081310 -RUN curl -sSL "http://www.polishmywriting.com/download/atd_distribution081310.tgz" -o /tmp/atd.tar.gz \ +RUN curl -sSL "http://www.polishmywriting.com/download/atd_distribution${ATD_VERSION}.tgz" -o /tmp/atd.tar.gz \ && mkdir -p /usr/src/atd \ && tar -xzf /tmp/atd.tar.gz -C /usr/src/atd --strip-components 1 \ - && rm /tmp/atd.tar.gz* + && rm /tmp/atd.tar.gz* WORKDIR /usr/src/atd +EXPOSE 1049 ENTRYPOINT [ "sh", "-c", "/usr/src/atd/run.sh" ] diff --git a/cf-reset-cache/Dockerfile b/cf-reset-cache/Dockerfile index f3bba2c..edbcae9 100644 --- a/cf-reset-cache/Dockerfile +++ b/cf-reset-cache/Dockerfile @@ -1,11 +1,9 @@ -FROM debian:wheezy +FROM alpine:latest MAINTAINER Jessica Frazelle -RUN apt-get update && apt-get install -y \ - ca-certificates \ - python-boto \ - --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* +RUN apk add --no-cache \ + py-boto + COPY ./reset-cache.py /bin/reset-cache.py diff --git a/zookeeper/Dockerfile b/zookeeper/Dockerfile index 3394bd3..b235ef5 100644 --- a/zookeeper/Dockerfile +++ b/zookeeper/Dockerfile @@ -1,4 +1,4 @@ -FROM java:openjdk-7-jdk-alpine +FROM java:7-alpine ENV ZOOKEEPER_VERSION 3.4.8 ENV PATH $PATH:/opt/zookeeper/bin/