From b705c9662b9a6951aecc40396196ccb0f78a856d Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Thu, 29 Nov 2018 16:56:52 -0500 Subject: [PATCH] fix foss-heartbeat and couchpotato Signed-off-by: Jess Frazelle --- couchpotato/Dockerfile | 6 +----- foss-heartbeat/Dockerfile | 8 ++------ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/couchpotato/Dockerfile b/couchpotato/Dockerfile index 414bfb5..64b85f4 100644 --- a/couchpotato/Dockerfile +++ b/couchpotato/Dockerfile @@ -9,7 +9,7 @@ # --name couchpotato \ # jess/couchpotato # -FROM alpine:latest +FROM python:2-alpine LABEL maintainer "Jessie Frazelle " # machine parsable metadata, for https://github.com/pycampers/dockapt @@ -32,13 +32,9 @@ RUN apk add --no-cache \ libxslt-dev \ musl-dev \ openssl-dev \ - python \ - python-dev \ - py2-pip \ && rm -rf /var/lib/apt/lists/* RUN pip install \ - cffi \ lxml \ pyopenssl diff --git a/foss-heartbeat/Dockerfile b/foss-heartbeat/Dockerfile index a3ae3fa..b83aa76 100644 --- a/foss-heartbeat/Dockerfile +++ b/foss-heartbeat/Dockerfile @@ -1,14 +1,11 @@ -FROM alpine:latest +FROM python:2-alpine RUN apk add --no-cache \ ca-certificates \ bash \ gfortran \ openjdk8-jre-base \ - lapack \ - python \ - py-pip \ - py-numpy + lapack # Install the requirements RUN set -x \ @@ -18,7 +15,6 @@ RUN set -x \ lapack-dev \ libffi-dev \ openssl-dev \ - python-dev \ && ln -s /usr/include/locale.h /usr/include/xlocale.h \ && git clone --depth 1 https://github.com/sarahsharp/foss-heartbeat.git /usr/src/foss-heartbeat \ && ( \