Changes to enable building the image

vlulla · Nov 5, 2024 · d8146f5 · d8146f5
1 parent e4285b5
commit d8146f5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/datascience-docker/Dockerfile b/datascience-docker/Dockerfile
@@ -51,9 +51,9 @@ apt-get update -qq --yes
 apt-get install --yes osquery
 EOT
 
-ARG UID=${UID:-1000}
+ARG UID=${UID:-1010}
 ARG USR=${USR:-usr}
-ARG GID=${GID:-1000}
+ARG GID=${GID:-1010}
 ARG GRP=${GRP:-grp}
 
 ## ## See the rules that ADD obeys at https://docs.docker.com/engine/reference/builder/#add
@@ -100,7 +100,7 @@ EOF
 ) >> /home/${USR}/.zshrc
 mkdir -p /home/${USR}/.local
 aria2c https://github.com/clojure/brew-install/releases/latest/download/linux-install.sh && bash ./linux-install.sh -p /home/${USR}/.local && rm -rf linux-install.sh
-duckdb -noheader -line -init /dev/null :memory: "select 'INSTALL '''||extension_name||''';' as stmt from duckdb_extensions() order by extension_name;" | sed -E -e 's-stmt = --g' -e '/(shell|jemalloc)/d' | duckdb :memory:
+duckdb -noheader -line -init /dev/null :memory: "select 'INSTALL '''||extension_name||''';' as stmt from duckdb_extensions() order by extension_name;" | sed -E -e 's-stmt = --g' -e '/(shell|jemalloc|delta)/d' | duckdb :memory:
 EOT
 
 RUN <<EOT

diff --git a/datascience-docker/Makefile b/datascience-docker/Makefile
@@ -12,7 +12,8 @@ MAKEFLAGS += --no-builtin-rules
 
 IMGTAG=vl-ds
 ifeq ($(shell uname -s), Linux)
-	BUILD_ARGS=--build-arg UID=$$(id -u) --build-arg USR=$$(id -un) --build-arg GID=$$(id -g) --build-arg GRP=$$(id -gn)
+	## BUILD_ARGS=--build-arg UID=$$(id -u) --build-arg USR=$$(id -un) --build-arg GID=$$(id -g) --build-arg GRP=$$(id -gn)
+	BUILD_ARGS=
 else
 	BUILD_ARGS=
 endif