From cba61c5305a103a84417a7b2249ce24940d21ada Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Mon, 25 Jul 2022 19:37:16 +0100 Subject: [PATCH] Update Dockerfiles * Do not change the CDN to 6 on the integration Dockerfile, that is updated on the current images * Upgrade to new docker recomended guidelines, creating slightly smaller images --- Dockerfile | 10 +++++----- tests/integration/Dockerfile | 19 +++++++++---------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index d4ec796..a9c6b14 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ FROM python:3.7-alpine MAINTAINER f1yegor -ADD docker-requirements.txt /app/requirements.txt -ADD grafcli.conf.example /etc/grafcli/grafcli.conf +COPY docker-requirements.txt /app/requirements.txt +COPY grafcli.conf.example /etc/grafcli/grafcli.conf -RUN pip3 install --upgrade pip -RUN pip3 install -r /app/requirements.txt -RUN pip3 install grafcli +RUN pip3 install --upgrade pip \ + && pip3 install -r /app/requirements.txt \ + && RUN pip3 install grafcli VOLUME ["/etc/grafcli/"] VOLUME ["/db"] diff --git a/tests/integration/Dockerfile b/tests/integration/Dockerfile index 246ddf0..39b2ed7 100644 --- a/tests/integration/Dockerfile +++ b/tests/integration/Dockerfile @@ -1,16 +1,15 @@ FROM python:3.7-alpine -ADD tests/integration/entrypoint.sh /entrypoint.sh -ADD tests/integration/wait-for-it.sh /wait-for-it.sh +COPY tests/integration/entrypoint.sh /entrypoint.sh +COPY tests/integration/wait-for-it.sh /wait-for-it.sh -RUN sed -i s/6/cdn/ /etc/apk/repositories && apk add --update --progress make bats -ADD requirements.txt /app/requirements.txt -RUN pip3 install --upgrade pip -RUN pip3 install -r /app/requirements.txt - -RUN mkdir -p /etc/grafcli -RUN ln -s /app/grafcli.conf.example /etc/grafcli/grafcli.conf -RUN ln -s /app/scripts/grafcli /usr/local/bin/grafcli +RUN apk add --update --progress make bats +COPY requirements.txt /app/requirements.txt +RUN pip3 install --upgrade pip \ + && pip3 install -r /app/requirements.txt \ + && mkdir -p /etc/grafcli \ + && ln -s /app/grafcli.conf.example /etc/grafcli/grafcli.conf \ + && ln -s /app/scripts/grafcli /usr/local/bin/grafcli ENV PYTHONPATH=/app