Merge branch '1.8.latest' into backport-1045-to-1.8.latest

dbt-labs · Sep 10, 2024 · 131920d · 131920d
2 parents 2e574ae + b98632e
commit 131920d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/dagger/spark-container/install_spark.sh b/dagger/spark-container/install_spark.sh
@@ -4,7 +4,7 @@ SPARK_VERSION=3.1.3
 HADOOP_VERSION=3.2
 
 apt-get update && \
-apt-get install -y wget netcat procps libpostgresql-jdbc-java && \
+apt-get install -y wget netcat-openbsd procps libpostgresql-jdbc-java && \
 wget -q "https://archive.apache.org/dist/spark/spark-${SPARK_VERSION}/spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz" && \
 tar xzf "spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz" && \
 rm "spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz" && \

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -1,6 +1,6 @@
 # install latest changes in dbt-core
 # TODO: how to automate switching from develop to version branches?
-git+https://github.com/dbt-labs/dbt-core.git@1.8.latest#egg=dbt-core&subdirectory=core
+git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-core&subdirectory=core
 git+https://github.com/dbt-labs/dbt-common.git
 git+https://github.com/dbt-labs/dbt-adapters.git
 git+https://github.com/dbt-labs/dbt-adapters.git#subdirectory=dbt-tests-adapter

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -13,7 +13,7 @@ ENV SPARK_HOME /usr/spark
 ENV PATH="/usr/spark/bin:/usr/spark/sbin:${PATH}"
 
 RUN apt-get update && \
-    apt-get install -y wget netcat procps libpostgresql-jdbc-java && \
+    apt-get install -y wget netcat-openbsd procps libpostgresql-jdbc-java && \
     wget -q "http://archive.apache.org/dist/spark/spark-${SPARK_VERSION}/spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz" && \
     tar xzf "spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz" && \
     rm "spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz" && \