fix foss-heartbeat and couchpotato

Signed-off-by: Jess Frazelle <acidburn@github.com>
This commit is contained in:
Jess Frazelle 2018-11-29 16:56:52 -05:00
parent 3c0ec06020
commit b705c9662b
2 changed files with 3 additions and 11 deletions

View File

@ -9,7 +9,7 @@
# --name couchpotato \ # --name couchpotato \
# jess/couchpotato # jess/couchpotato
# #
FROM alpine:latest FROM python:2-alpine
LABEL maintainer "Jessie Frazelle <jess@linux.com>" LABEL maintainer "Jessie Frazelle <jess@linux.com>"
# machine parsable metadata, for https://github.com/pycampers/dockapt # machine parsable metadata, for https://github.com/pycampers/dockapt
@ -32,13 +32,9 @@ RUN apk add --no-cache \
libxslt-dev \ libxslt-dev \
musl-dev \ musl-dev \
openssl-dev \ openssl-dev \
python \
python-dev \
py2-pip \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN pip install \ RUN pip install \
cffi \
lxml \ lxml \
pyopenssl pyopenssl

View File

@ -1,14 +1,11 @@
FROM alpine:latest FROM python:2-alpine
RUN apk add --no-cache \ RUN apk add --no-cache \
ca-certificates \ ca-certificates \
bash \ bash \
gfortran \ gfortran \
openjdk8-jre-base \ openjdk8-jre-base \
lapack \ lapack
python \
py-pip \
py-numpy
# Install the requirements # Install the requirements
RUN set -x \ RUN set -x \
@ -18,7 +15,6 @@ RUN set -x \
lapack-dev \ lapack-dev \
libffi-dev \ libffi-dev \
openssl-dev \ openssl-dev \
python-dev \
&& ln -s /usr/include/locale.h /usr/include/xlocale.h \ && 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 \ && git clone --depth 1 https://github.com/sarahsharp/foss-heartbeat.git /usr/src/foss-heartbeat \
&& ( \ && ( \