Skip to content

Commit

Permalink
Updated to DuckDB v1.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
prmoore77 committed Sep 24, 2024
1 parent f8c7297 commit 7f3fb39
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.12.5
FROM python:3.12.6

ARG TARGETPLATFORM
ARG TARGETARCH
Expand Down Expand Up @@ -90,7 +90,7 @@ RUN cmake -S . -B build -G Ninja \
COPY --chown=app_user:app_user ./tls ./tls

# Install DuckDB CLI for troubleshooting, etc.
ARG DUCKDB_VERSION="1.1.0"
ARG DUCKDB_VERSION="1.1.1"

RUN case ${TARGETPLATFORM} in \
"linux/amd64") DUCKDB_FILE=https://github.com/duckdb/duckdb/releases/download/v${DUCKDB_VERSION}/duckdb_cli-linux-amd64.zip ;; \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.ci
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.12.5
FROM python:3.12.6

ARG TARGETPLATFORM
ARG TARGETARCH
Expand Down Expand Up @@ -81,7 +81,7 @@ RUN chmod +x /usr/local/bin/sqlflite_client
COPY --chown=app_user:app_user tls tls

# Install DuckDB CLI for troubleshooting, etc.
ARG DUCKDB_VERSION="1.1.0"
ARG DUCKDB_VERSION="1.1.1"

RUN case ${TARGETPLATFORM} in \
"linux/amd64") DUCKDB_FILE=https://github.com/duckdb/duckdb/releases/download/v${DUCKDB_VERSION}/duckdb_cli-linux-amd64.zip ;; \
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ The above command will automatically mount a very small TPC-H DuckDB database fi
**Note**: You can disable TLS in the container by setting environment variable: `TLS_ENABLED` to "0" (default is "1" - enabled). This is not recommended unless you are using an mTLS sidecar in Kubernetes or something similar, as it will be insecure.

### Optional - open a different database file
When running the Docker image - you can have it run your own DuckDB database file (the database must be built with DuckDB version: 1.1.0).
When running the Docker image - you can have it run your own DuckDB database file (the database must be built with DuckDB version: 1.1.1).

Prerequisite: DuckDB CLI
Install DuckDB CLI version [1.1.0](https://github.com/duckdb/duckdb/releases/tag/v1.1.0) - and make sure the executable is on your PATH.
Install DuckDB CLI version [1.1.1](https://github.com/duckdb/duckdb/releases/tag/v1.1.1) - and make sure the executable is on your PATH.

Platform Downloads:
[Linux x86-64](https://github.com/duckdb/duckdb/releases/download/v1.1.0/duckdb_cli-linux-amd64.zip)
[Linux arm64 (aarch64)](https://github.com/duckdb/duckdb/releases/download/v1.1.0/duckdb_cli-linux-aarch64.zip)
[MacOS Universal](https://github.com/duckdb/duckdb/releases/download/v1.1.0/duckdb_cli-osx-universal.zip)
[Linux x86-64](https://github.com/duckdb/duckdb/releases/download/v1.1.1/duckdb_cli-linux-amd64.zip)
[Linux arm64 (aarch64)](https://github.com/duckdb/duckdb/releases/download/v1.1.1/duckdb_cli-linux-aarch64.zip)
[MacOS Universal](https://github.com/duckdb/duckdb/releases/download/v1.1.1/duckdb_cli-osx-universal.zip)

In this example, we'll generate a new TPC-H Scale Factor 1 (1GB) database file, and then run the docker image to mount it:

Expand Down Expand Up @@ -197,7 +197,7 @@ version(): string
Results:
version(): [
"v1.1.0"
"v1.1.1"
]
Total: 1
Expand Down Expand Up @@ -283,7 +283,7 @@ This option allows choosing from two backends: SQLite and DuckDB. It defaults to
$ SQLFLITE_PASSWORD="sqlflite_password" sqlflite_server --database-filename data/TPC-H-small.duckdb
Apache Arrow version: 17.0.0
WARNING - TLS is disabled for the SQLFlite server - this is insecure.
DuckDB version: v1.1.0
DuckDB version: v1.1.1
Running Init SQL command:
SET autoinstall_known_extensions = true;
Running Init SQL command:
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pandas==2.2.*
duckdb==1.1.0
duckdb==1.1.1
click==8.1.*
pyarrow==17.0.0
adbc-driver-flightsql==1.1.*
adbc-driver-manager==1.1.*
adbc-driver-flightsql==1.2.*
adbc-driver-manager==1.2.*
2 changes: 1 addition & 1 deletion third_party/DuckDB_CMakeLists.txt.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ExternalProject_Add(
duckdb_project
PREFIX ${CMAKE_BINARY_DIR}/third_party
GIT_REPOSITORY https://github.com/duckdb/duckdb
GIT_TAG v1.1.0
GIT_TAG v1.1.1
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/third_party/duckdb
)

0 comments on commit 7f3fb39

Please sign in to comment.