From 29eb4ed636e4765e4ee127f59a325d45bfeb0b55 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sun, 19 Apr 2020 02:21:02 +0300 Subject: fr24feed: cleaner Docker builds --- fr24feed/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fr24feed/Dockerfile b/fr24feed/Dockerfile index fe2d1e3..194e081 100644 --- a/fr24feed/Dockerfile +++ b/fr24feed/Dockerfile @@ -30,12 +30,13 @@ ENV fr24feed_archive_name="fr24feed_${fr24feed_version}_${fr24feed_archive_suffi WORKDIR /tmp ADD ["https://repo-feed.flightradar24.com/$fr24feed_directory/$fr24feed_archive_name", "./"] RUN tar xzf "$fr24feed_archive_name" -ENV fr24feed_directory="fr24feed_${fr24feed_archive_suffix}" -FROM builder +FROM env-$TARGETARCH LABEL maintainer="Egor Tensin " +ENV fr24feed_directory="fr24feed_${fr24feed_archive_suffix}" + # Don't prompt: ENV DEBIAN_FRONTEND=noninteractive @@ -44,7 +45,7 @@ RUN runtime_deps='ca-certificates procps' && \ apt-get update -yq && \ apt-get install -yq --no-install-recommends $runtime_deps -COPY --from=builder ["/tmp/$fr24feed_directory", "/tmp/"] +COPY --from=builder ["/tmp/$fr24feed_directory", "/tmp/$fr24feed_directory/"] COPY ["fr24feed.ini", "/etc/"] EXPOSE 8754 -- cgit v1.2.3