From 4d1422354e5eecadf7cde7b3cfac9583931a2dcc Mon Sep 17 00:00:00 2001 From: Michael Whitaker Date: Wed, 28 Jun 2023 08:42:26 -0700 Subject: [PATCH] update to dbt v1.5 (#54) --- Docker_build/Dockerfile | 74 ++++++++++++++++++++--------------------- Docker_build/README.md | 6 ++-- Dockerfile | 2 +- README.md | 4 +-- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/Docker_build/Dockerfile b/Docker_build/Dockerfile index fefbabe..de2d962 100644 --- a/Docker_build/Dockerfile +++ b/Docker_build/Dockerfile @@ -7,19 +7,19 @@ ARG build_for=linux/amd64 ## -# base image (abstract) +# base image (abstract). Note that 3.11 does not build ## FROM --platform=$build_for python:3.9.9-slim-bullseye as base # N.B. The refs updated automagically every release via bumpversion # N.B. dbt-postgres is currently found in the core codebase so a value of dbt-core@ is correct -ARG dbt_core_ref=dbt-core@v1.4.6 -ARG dbt_postgres_ref=dbt-core@v1.4.6 -ARG dbt_redshift_ref=dbt-redshift@v1.4.0 -ARG dbt_bigquery_ref=dbt-bigquery@v1.4.3 -ARG dbt_snowflake_ref=dbt-snowflake@v1.4.2 -ARG dbt_spark_ref=dbt-spark@v1.4.1 +ARG dbt_core_ref=dbt-core@v1.5.0 +ARG dbt_postgres_ref=dbt-core@v1.5.0 +ARG dbt_redshift_ref=dbt-redshift@v1.5.0 +ARG dbt_bigquery_ref=dbt-bigquery@v1.5.0 +ARG dbt_snowflake_ref=dbt-snowflake@v1.5.0 +ARG dbt_spark_ref=dbt-spark@v1.5.0 # special case args ARG dbt_spark_version=all ARG dbt_third_party @@ -28,18 +28,18 @@ ARG dbt_third_party RUN apt-get update \ && apt-get dist-upgrade -y \ && apt-get install -y --no-install-recommends \ - git \ - ssh-client \ - software-properties-common \ - make \ - build-essential \ - ca-certificates \ - libpq-dev \ + git \ + ssh-client \ + software-properties-common \ + make \ + build-essential \ + ca-certificates \ + libpq-dev \ && apt-get clean \ && rm -rf \ - /var/lib/apt/lists/* \ - /tmp/* \ - /var/tmp/* + /var/lib/apt/lists/* \ + /tmp/* \ + /var/tmp/* # Env vars ENV PYTHONIOENCODING=utf-8 @@ -93,16 +93,15 @@ FROM base as dbt-spark RUN apt-get update \ && apt-get dist-upgrade -y \ && apt-get install -y --no-install-recommends \ - python-dev \ - libsasl2-dev \ - libsasl2-modules \ - gcc \ - unixodbc-dev \ + python-dev \ + libsasl2-dev \ + gcc \ + unixodbc-dev \ && apt-get clean \ && rm -rf \ - /var/lib/apt/lists/* \ - /tmp/* \ - /var/tmp/* + /var/lib/apt/lists/* \ + /tmp/* \ + /var/tmp/* RUN python -m pip install --no-cache-dir "git+https://github.com/dbt-labs/${dbt_spark_ref}#egg=dbt-spark[${dbt_spark_version}]" @@ -119,18 +118,17 @@ FROM base as dbt-all RUN apt-get update \ && apt-get dist-upgrade -y \ && apt-get install -y --no-install-recommends \ - python-dev \ - libsasl2-dev \ - libsasl2-modules \ - gcc \ - unixodbc-dev \ + python-dev \ + libsasl2-dev \ + gcc \ + unixodbc-dev \ && apt-get clean \ && rm -rf \ - /var/lib/apt/lists/* \ - /tmp/* \ - /var/tmp/* -RUN python -m pip install --no-cache "git+https://github.com/dbt-labs/${dbt_redshift_ref}#egg=dbt-redshift" -RUN python -m pip install --no-cache "git+https://github.com/dbt-labs/${dbt_bigquery_ref}#egg=dbt-bigquery" -RUN python -m pip install --no-cache "git+https://github.com/dbt-labs/${dbt_snowflake_ref}#egg=dbt-snowflake" -RUN python -m pip install --no-cache "git+https://github.com/dbt-labs/${dbt_spark_ref}#egg=dbt-spark[${dbt_spark_version}]" -RUN python -m pip install --no-cache "git+https://github.com/dbt-labs/${dbt_postgres_ref}#egg=dbt-postgres&subdirectory=plugins/postgres" \ No newline at end of file + /var/lib/apt/lists/* \ + /tmp/* \ + /var/tmp/* + RUN python -m pip install --no-cache "git+https://github.com/dbt-labs/${dbt_redshift_ref}#egg=dbt-redshift" + RUN python -m pip install --no-cache "git+https://github.com/dbt-labs/${dbt_bigquery_ref}#egg=dbt-bigquery" + RUN python -m pip install --no-cache "git+https://github.com/dbt-labs/${dbt_snowflake_ref}#egg=dbt-snowflake" + RUN python -m pip install --no-cache "git+https://github.com/dbt-labs/${dbt_spark_ref}#egg=dbt-spark[${dbt_spark_version}]" + RUN python -m pip install --no-cache "git+https://github.com/dbt-labs/${dbt_postgres_ref}#egg=dbt-postgres&subdirectory=plugins/postgres" \ No newline at end of file diff --git a/Docker_build/README.md b/Docker_build/README.md index ba6f91e..23545d7 100644 --- a/Docker_build/README.md +++ b/Docker_build/README.md @@ -2,6 +2,8 @@ update the references in the Dockerfile to current ones. -`docker build --tag mwhitaker/dbt_all:v1.4.6 --target dbt-all .` +using the dbt [Dockerfile](https://github.com/dbt-labs/dbt-core/blob/main/docker/Dockerfile) as a template. -`docker push mwhitaker/dbt_all:v1.4.6` \ No newline at end of file +`docker build --tag mwhitaker/dbt_all:v1.5.0 --target dbt-all .` + +`docker push mwhitaker/dbt_all:v1.5.0` \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index f0ca78f..e69e937 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG DBT_VERSION=v1.4.6 +ARG DBT_VERSION=v1.5.0 FROM mwhitaker/dbt_all:${DBT_VERSION} COPY entrypoint.sh /entrypoint.sh diff --git a/README.md b/README.md index 4a2f47e..6038f8f 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@ A GitHub Action to run [dbt](https://www.getdbt.com) commands in a Docker container. It uses the official images provided by [Fishtown Analytics](https://hub.docker.com/r/fishtownanalytics/dbt/tags). You can use [dbt commands](https://docs.getdbt.com/reference/dbt-commands) such as `run`, `test` and `debug`. This action captures the dbt console output for use in subsequent steps. ### dbt version -The current version of dbt is **1.4.6**. Please note that from dbt v1.0.0. you may have to change your dbt project structure compared to v0.x.x. See the [migration](https://docs.getdbt.com/docs/guides/migration-guide/upgrading-to-1-0-0) docs. +The current version of dbt is **1.5.0**. Please note that from dbt v1.0.0. you may have to change your dbt project structure compared to v0.x.x. See the [migration](https://docs.getdbt.com/docs/guides/migration-guide/upgrading-to-1-0-0) docs. -dbt updates their [docker images](https://hub.docker.com/r/fishtownanalytics/dbt/tags?page=1&ordering=last_updated) on a frequent basis and the main branch of this Github Action should be close to the last stable tag. If you need to use an earlier version of dbt, you can call this action with a specific [release](https://github.com/mwhitaker/dbt-action/releases), eg `mwhitaker/dbt-action@v0.21.0` or `mwhitaker/dbt-action@v0.19.1`. +dbt updates their [docker images](https://hub.docker.com/r/fishtownanalytics/dbt/tags?page=1&ordering=last_updated) on a frequent basis and the main branch of this Github Action should be close to the last stable tag. If you need to use an earlier version of dbt, you can call this action with a specific [release](https://github.com/mwhitaker/dbt-action/releases), eg `mwhitaker/dbt-action@v0.21.0` or `mwhitaker/dbt-action@v1.5.0`. ## Usage