Fix Docker release process for dbt-postgres

.changes/unreleased/Fixes-20240327-150013.yaml

@@ -0,0 +1,7 @@
+kind: Fixes
+body: '"Fix Docker release process to account for both historical and current versions
+  of `dbt-postgres`'
+time: 2024-03-27T15:00:13.388268-04:00
+custom:
+  Author: mikealfare
+  Issue: "9827"

.github/workflows/release-docker.yml

@@ -68,10 +68,18 @@ jobs:
       - name: Get docker build arg
         id: build_arg
         run: |
-          BUILD_ARG_NAME=$(echo ${{ inputs.package }} | sed 's/\-/_/g')
-          BUILD_ARG_VALUE=$(echo ${{ inputs.package }} | sed 's/postgres/core/g')
-          echo "name=$BUILD_ARG_NAME" >> $GITHUB_OUTPUT
-          echo "value=$BUILD_ARG_VALUE" >> $GITHUB_OUTPUT
+          repo_arg=$(echo ${{ inputs.package }} | sed 's/\-/_/g')
+          if [[ ${{ inputs.version_number }} < 1.8.0 ]];
+          then
+            repo_value=$(echo ${{ inputs.package }} | sed 's/postgres/core/g')
+            dbt_postgres_subdirectory="&subdirectory=plugins/postgres"
+          else
+            repo_value=${{ inputs.package }}
+            dbt_postgres_subdirectory=""
+          fi
+          echo "repo_arg=$repo_arg" >> $GITHUB_OUTPUT
+          echo "repo_value=$repo_value" >> $GITHUB_OUTPUT
+          echo "dbt_postgres_subdirectory=$dbt_postgres_subdirectory" >> $GITHUB_OUTPUT
 
       - name: Log in to GHCR
         uses: docker/login-action@v3
@@ -96,5 +104,7 @@ jobs:
           file: docker/Dockerfile
           push: True
           target: ${{ inputs.package }}
-          build-args: ${{ steps.build_arg.outputs.name }}_ref=${{ steps.build_arg.outputs.value }}@v${{ inputs.version_number }}
+          build-args: |
+            ${{ steps.build_arg.outputs.repo_arg }}_ref=${{ steps.build_arg.outputs.repo_value }}@v${{ inputs.version_number }}
+            dbt_postgres_subdirectory=${{ steps.build_arg.outputs.dbt_postgres_subdirectory }}
           tags: ${{ needs.version_metadata.outputs.fully_qualified_tags }}

docker/Dockerfile

@@ -21,6 +21,7 @@ ARG [email protected]
 ARG [email protected]
 ARG [email protected]
 # special case args
+ARG dbt_postgres_subdirectory=""
 ARG dbt_spark_version=all
 ARG dbt_third_party
 
@@ -62,7 +63,7 @@ RUN python -m pip install --no-cache-dir "git+https://github.com/dbt-labs/${dbt_
 # dbt-postgres
 ##
 FROM base as dbt-postgres
-RUN python -m pip install --no-cache-dir "git+https://github.com/dbt-labs/${dbt_postgres_ref}#egg=dbt-postgres"
+RUN python -m pip install --no-cache-dir "git+https://github.com/dbt-labs/${dbt_postgres_ref}#egg=dbt-postgres${dbt_postgres_subdirectory}"
 
 
 ##
@@ -130,4 +131,4 @@ RUN apt-get update \
   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"
+  RUN python -m pip install --no-cache "git+https://github.com/dbt-labs/${dbt_postgres_ref}#egg=dbt-postgres${dbt_postgres_subdirectory}"