Merge pull request #3019 from fishtown-analytics/fix/cleanup-dockerfile

Clean up docker resources
dbt-labs · Jan 25, 2021 · 540c1fd · 540c1fd
2 parents 42a85ac + 116e18a
commit 540c1fd
Show file tree

Hide file tree

Showing 17 changed files with 37 additions and 264 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,9 @@
 ## dbt 0.19.0 (Release TBD)
 
-## dbt 0.19.0rc2 (January 14, 2021)
+### Under the hood
+- Cleanup docker resources, use single `docker/Dockerfile` for publishing dbt as a docker image ([dbt-release#3](https://github.com/fishtown-analytics/dbt-release/issues/3), [#3019](https://github.com/fishtown-analytics/dbt/pull/3019))
 
+## dbt 0.19.0rc2 (January 14, 2021)
 
 ### Fixes
 - Fix regression with defining exposures and other resources with the same name ([#2969](https://github.com/fishtown-analytics/dbt/issues/2969), [#3009](https://github.com/fishtown-analytics/dbt/pull/3009))

diff --git a/Dockerfile → Dockerfile.test b/Dockerfile → Dockerfile.test
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,6 +1,5 @@
-version: '3.5'
+version: "3.5"
 services:
-
   database:
     image: postgres
     environment:
@@ -13,7 +12,7 @@ services:
   test:
     build:
       context: .
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile.test
       args:
         # Run `make .env` to set $USER_ID and $GROUP_ID
         USER_ID: ${USER_ID:-}

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -0,0 +1,32 @@
+ARG BASE_IMAGE="python:3.8-slim-buster"
+
+FROM $BASE_IMAGE
+ARG BASE_REQUIREMENTS_SRC_PATH
+ARG WHEEL_REQUIREMENTS_SRC_PATH
+ARG DIST_PATH
+RUN apt-get update \
+    && apt-get dist-upgrade -y \
+    && apt-get install -y --no-install-recommends \
+    git \
+    software-properties-common \
+    make \
+    build-essential \
+    ca-certificates \
+    libpq-dev \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+RUN echo BASE_REQUIREMENTS_SRC_PATH=$BASE_REQUIREMENTS_SRC_PATH
+RUN echo WHEEL_REQUIREMENTS_SRC_PATH=$WHEEL_REQUIREMENTS_SRC_PATH
+RUN echo DIST_PATH=$DIST_PATH
+COPY $BASE_REQUIREMENTS_SRC_PATH ./requirements.txt
+COPY $WHEEL_REQUIREMENTS_SRC_PATH ./wheel_requirements.txt
+COPY $DIST_PATH ./dist
+RUN pip install --upgrade pip setuptools
+RUN pip install --requirement ./requirements.txt
+RUN pip install --requirement ./wheel_requirements.txt
+ENV PYTHONIOENCODING=utf-8
+ENV LANG C.UTF-8
+WORKDIR /usr/app
+VOLUME /usr/app
+ENTRYPOINT ["dbt"]
diff --git a/docker/Dockerfile.0.15.3 b/docker/Dockerfile.0.15.3
diff --git a/docker/Dockerfile.0.16.0 b/docker/Dockerfile.0.16.0
diff --git a/docker/Dockerfile.0.16.0b2 b/docker/Dockerfile.0.16.0b2
diff --git a/docker/Dockerfile.0.16.0b3 b/docker/Dockerfile.0.16.0b3
diff --git a/docker/Dockerfile.0.16.0rc2 b/docker/Dockerfile.0.16.0rc2
diff --git a/docker/Dockerfile.0.16.0rc3 b/docker/Dockerfile.0.16.0rc3
diff --git a/docker/Dockerfile.0.16.0rc4 b/docker/Dockerfile.0.16.0rc4
diff --git a/docker/Dockerfile.0.16.1rc1 b/docker/Dockerfile.0.16.1rc1
diff --git a/docker/Dockerfile.0.17.0b1 b/docker/Dockerfile.0.17.0b1
diff --git a/docker/Dockerfile.0.17.0rc1 b/docker/Dockerfile.0.17.0rc1
diff --git a/docker/Dockerfile.0.17.0rc2 b/docker/Dockerfile.0.17.0rc2
diff --git a/docker/Dockerfile.0.17.0rc3 b/docker/Dockerfile.0.17.0rc3
diff --git a/docker/Dockerfile.0.17.0rc4 b/docker/Dockerfile.0.17.0rc4