From e2af543ef479e4d87674f55305b58c53ecf197bd Mon Sep 17 00:00:00 2001 From: jrhizor Date: Fri, 11 Sep 2020 13:01:17 -0700 Subject: [PATCH] move labels to bottom of dockerfiles for better caching --- .../singer/bigquery/destination/Dockerfile | 4 ++-- dataline-integrations/singer/csv/destination/Dockerfile | 4 ++-- .../singer/exchangerateapi_io/source/Dockerfile | 4 ++-- .../singer/postgres/destination/Dockerfile | 4 ++-- dataline-integrations/singer/postgres/source/Dockerfile | 4 ++-- tools/build/Dockerfile.base | 7 ++++--- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dataline-integrations/singer/bigquery/destination/Dockerfile b/dataline-integrations/singer/bigquery/destination/Dockerfile index af631cc1bf9c1..cd37995be91ca 100644 --- a/dataline-integrations/singer/bigquery/destination/Dockerfile +++ b/dataline-integrations/singer/bigquery/destination/Dockerfile @@ -1,7 +1,5 @@ FROM python:3.7-alpine -LABEL io.dataline.version=0.1.1 - WORKDIR /singer ENV VIRTUAL_ENV=/singer/env @@ -18,3 +16,5 @@ RUN python -m pip install --upgrade pip && \ COPY bigquery-destination.sh /singer/bigquery-destination.sh ENTRYPOINT ["sh", "/singer/bigquery-destination.sh"] + +LABEL io.dataline.version=0.1.1 diff --git a/dataline-integrations/singer/csv/destination/Dockerfile b/dataline-integrations/singer/csv/destination/Dockerfile index 55243734e75c4..3644d87c47300 100644 --- a/dataline-integrations/singer/csv/destination/Dockerfile +++ b/dataline-integrations/singer/csv/destination/Dockerfile @@ -1,7 +1,5 @@ FROM python:3.7-slim -LABEL io.dataline.version=0.1.1 - WORKDIR /singer ENV VIRTUAL_ENV=/singer/env @@ -14,3 +12,5 @@ RUN python -m pip install --upgrade pip && \ pip install -r requirements.txt ENTRYPOINT ["target-csv"] + +LABEL io.dataline.version=0.1.1 diff --git a/dataline-integrations/singer/exchangerateapi_io/source/Dockerfile b/dataline-integrations/singer/exchangerateapi_io/source/Dockerfile index 4a50f8ba41f25..ab49a2b9b5760 100644 --- a/dataline-integrations/singer/exchangerateapi_io/source/Dockerfile +++ b/dataline-integrations/singer/exchangerateapi_io/source/Dockerfile @@ -1,7 +1,5 @@ FROM python:3.7-slim -LABEL io.dataline.version=0.1.1 - WORKDIR /singer ENV VIRTUAL_ENV=/singer/env @@ -14,3 +12,5 @@ RUN python -m pip install --upgrade pip && \ pip install -r requirements.txt ENTRYPOINT ["tap-exchangeratesapi"] + +LABEL io.dataline.version=0.1.1 diff --git a/dataline-integrations/singer/postgres/destination/Dockerfile b/dataline-integrations/singer/postgres/destination/Dockerfile index f363ca679912f..9067d8d3dbefe 100644 --- a/dataline-integrations/singer/postgres/destination/Dockerfile +++ b/dataline-integrations/singer/postgres/destination/Dockerfile @@ -1,7 +1,5 @@ FROM python:3.7-slim -LABEL io.dataline.version=0.1.1 - WORKDIR /singer ENV VIRTUAL_ENV=/singer/env @@ -22,3 +20,5 @@ RUN apt-get update && \ pip install -r requirements.txt ENTRYPOINT ["/run.sh"] + +LABEL io.dataline.version=0.1.1 diff --git a/dataline-integrations/singer/postgres/source/Dockerfile b/dataline-integrations/singer/postgres/source/Dockerfile index 06c032573a92e..4cf3b99655ddb 100644 --- a/dataline-integrations/singer/postgres/source/Dockerfile +++ b/dataline-integrations/singer/postgres/source/Dockerfile @@ -1,7 +1,5 @@ FROM python:3.7-slim -LABEL io.dataline.version=0.1.0 - WORKDIR /singer ENV VIRTUAL_ENV=/singer/env @@ -20,3 +18,5 @@ RUN python -m pip install --upgrade pip && \ RUN apt-get autoremove -y gcc ENTRYPOINT ["tap-postgres"] + +LABEL io.dataline.version=0.1.0 diff --git a/tools/build/Dockerfile.base b/tools/build/Dockerfile.base index ead9fc0b2cbbb..6968ac6540062 100644 --- a/tools/build/Dockerfile.base +++ b/tools/build/Dockerfile.base @@ -3,9 +3,6 @@ ##################### FROM ubuntu:20.04 -LABEL io.dataline.image=dataline/build-base -LABEL io.dataline.version=1.0.0 - WORKDIR /code ENV DEBIAN_FRONTEND noninteractive @@ -18,3 +15,7 @@ RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - RUN apt-get update && apt-get -y install \ nodejs \ openjdk-14-jdk + + +LABEL io.dataline.image=dataline/build-base +LABEL io.dataline.version=1.0.0