accounting for '2.590 E: The repository 'https://apache.jfrog.io/arti…

…factory/arrow/ubuntu focal InRelease' is not signed.'
b08x · Mar 24, 2024 · f5da171 · f5da171
1 parent 0af9ccc
commit f5da171
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 71 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,11 +18,11 @@ jobs:
     strategy:
       matrix:
         image_base_name:
-          - minimal
+          # - minimal
           - datascience
-          - llamaindex
-          - nlp
-          - audio
+          # - llamaindex
+          # - nlp
+          # - audio
 
     name: notebook-${{ matrix.image_base_name }}
     runs-on: ubuntu-latest

diff --git a/datascience/Dockerfile b/datascience/Dockerfile
@@ -5,9 +5,6 @@ LABEL maintainer="Robert Pannick <[email protected]>"
 
 USER root
 
-RUN apt-get update && \
-    apt-get install -y -V --no-install-recommends gpg-agent
-
 # Pre-requisites
 RUN echo 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal main' >> /etc/apt/sources.list && \
     echo 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main' >> /etc/apt/sources.list && \
@@ -17,52 +14,52 @@ RUN echo 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal main' >> /etc/apt/
     rm -rf /var/lib/apt/lists/*
 
 # Apache Arrow
-ENV APACHE_ARROW_VERSION=10.0.0
-
-RUN curl -sfSL -o /tmp/apache-arrow-apt-source-latest.deb \
-  https://apache.jfrog.io/artifactory/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
-  apt install -y --install-recommends \
-  /tmp/apache-arrow-apt-source-latest.deb && \
-  rm -f /tmp/apache-arrow-apt-source-latest.deb && \
-  apt update -qq && \
-  apt install -y \
-  libgirepository1.0-dev
-
-RUN mkdir -pv /home/$NB_USER/packages
-
-COPY packages packages/
-
-RUN apt install -y --no-install-recommends \
-    /home/$NB_USER/packages/gir1.2-arrow-1.0_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/gir1.2-arrow-cuda-1.0_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/gir1.2-gandiva-1.0_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/gir1.2-parquet-1.0_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/gir1.2-plasma-1.0_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/libarrow-cuda-dev_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/libarrow-cuda-glib-dev_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/libarrow-cuda-glib1100_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/libarrow-cuda1100_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/libarrow-dataset-dev_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/libarrow-dataset1100_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/libarrow-dev_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/libarrow-flight-dev_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/libarrow-flight1100_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/libarrow-glib-dev_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/libarrow-glib1100_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/libgandiva-dev_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/libgandiva-glib-dev_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/libgandiva-glib1100_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/libgandiva1100_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/libparquet-dev_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/libparquet-glib-dev_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/libparquet-glib1100_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/libparquet1100_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/libplasma-dev_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/libplasma-glib-dev_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/libplasma-glib1100_11.0.0-1_amd64.deb \
-    /home/$NB_USER/packages/libplasma1100_11.0.0-1_amd64.deb && \
-    apt-get autoremove -y && \
-    apt-get clean && rm -rf /var/lib/apt/lists/*
+# ENV APACHE_ARROW_VERSION=10.0.0
+
+# RUN curl -sfSL -o /tmp/apache-arrow-apt-source-latest.deb \
+#   https://apache.jfrog.io/artifactory/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
+#   apt install -y --install-recommends \
+#   /tmp/apache-arrow-apt-source-latest.deb && \
+#   rm -f /tmp/apache-arrow-apt-source-latest.deb && \
+#   apt update -qq && \
+#   apt install -y \
+#   libgirepository1.0-dev
+
+# RUN mkdir -pv /home/$NB_USER/packages
+
+# COPY packages packages/
+
+# RUN apt install -y --no-install-recommends \
+#     /home/$NB_USER/packages/gir1.2-arrow-1.0_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/gir1.2-arrow-cuda-1.0_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/gir1.2-gandiva-1.0_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/gir1.2-parquet-1.0_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/gir1.2-plasma-1.0_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/libarrow-cuda-dev_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/libarrow-cuda-glib-dev_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/libarrow-cuda-glib1100_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/libarrow-cuda1100_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/libarrow-dataset-dev_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/libarrow-dataset1100_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/libarrow-dev_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/libarrow-flight-dev_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/libarrow-flight1100_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/libarrow-glib-dev_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/libarrow-glib1100_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/libgandiva-dev_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/libgandiva-glib-dev_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/libgandiva-glib1100_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/libgandiva1100_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/libparquet-dev_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/libparquet-glib-dev_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/libparquet-glib1100_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/libparquet1100_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/libplasma-dev_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/libplasma-glib-dev_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/libplasma-glib1100_11.0.0-1_amd64.deb \
+#     /home/$NB_USER/packages/libplasma1100_11.0.0-1_amd64.deb && \
+#     apt-get autoremove -y && \
+#     apt-get clean && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /home/$NB_USER
 

diff --git a/datascience/Gemfile b/datascience/Gemfile
@@ -68,11 +68,11 @@ gem 'charty', '>= 0.2.12'
 gem 'matplotlib', '>= 1.2.0'
 gem 'numpy', '>= 0.4.0'
 gem 'pandas', '>= 0.3.8'
-gem 'red_amber', '0.4.2'
-gem 'red-arrow', '11.0.0'
-gem 'red-datasets', '>= 0.1.4'
-gem 'red-gandiva', '11.0.0'
-gem 'red-parquet', '11.0.0'
+# gem 'red_amber', '0.4.2'
+# gem 'red-arrow', '11.0.0'
+# gem 'red-datasets', '>= 0.1.4'
+# gem 'red-gandiva', '11.0.0'
+# gem 'red-parquet', '11.0.0'
 gem 'unicode_plot', '>= 0.0.5'
 
 # Additional gems
@@ -85,10 +85,10 @@ gem 'nmatrix-lapacke'
 gem 'numo-linalg'
 gem 'numo-narray'
 gem 'rbplotly'
-gem 'red-arrow-numo-narray'
-gem 'red-chainer'
-gem 'red-datasets-arrow'
-gem 'red-datasets-daru'
-gem 'red-datasets-pandas'
-gem 'red-plasma'
+# gem 'red-arrow-numo-narray'
+# gem 'red-chainer'
+# gem 'red-datasets-arrow'
+# gem 'red-datasets-daru'
+# gem 'red-datasets-pandas'
+# gem 'red-plasma'
 gem 'rumale'
diff --git a/llamaindex/Dockerfile b/llamaindex/Dockerfile
@@ -11,9 +11,6 @@ WORKDIR /home/$NB_USER
 ARG COMPONENTS=[all]
 
 RUN \
-    pip --no-cache-dir install spacy && \
-    python3 -m spacy download en_core_web_sm && \
-    python3 -m spacy download en_core_web_lg && \
     pip install --no-cache-dir -U pip wheel setuptools && \
     pip install --no-cache-dir llama-index-llms-ollama \
     llama-index-readers-obsidian llama-index-llms-langchain \

diff --git a/minimal/Dockerfile b/minimal/Dockerfile
@@ -22,6 +22,7 @@ RUN apt-get update && apt-get install -y -V --no-install-recommends \
       gcc \
       git \
       git-lfs \
+      gpg-agent \
       libczmq-dev \
       libffi-dev \
       libgdbm-dev \
@@ -104,7 +105,9 @@ RUN echo "[[ -f ~/.env ]] && source ~/.env" >> /home/$NB_USER/.bashrc
 
 RUN chown -R $NB_USER:$GROUP_ID /home/$NB_USER
 
-NB_USER $NB_UID
+USER $NB_UID
+
+RUN conda install nbconvert[all] -y && conda install pip -y
 
 RUN echo "gem: --user-install" >> $HOME/.gemrc
 
@@ -115,6 +118,4 @@ ENV BUNDLE_PATH $HOME/.local/share/gem
 
 RUN bundle install
 
-RUN conda update jupyterlab -y && conda install pip -y
-
 RUN iruby register --force
diff --git a/nlp/Dockerfile b/nlp/Dockerfile
@@ -1,5 +1,5 @@
 ARG BASE_IMAGE_TAG=latest
-FROM b08x/notebook-llamaindex:$BASE_IMAGE_TAG
+FROM b08x/notebook-datascience:$BASE_IMAGE_TAG
 
 LABEL maintainer="Robert Pannick <[email protected]>"
 
@@ -34,6 +34,10 @@ WORKDIR /home/$NB_USER
 # Locale environment variables
 ENV LC_ALL=C.UTF-8
 
+RUN pip --no-cache-dir install spacy && \
+    python3 -m spacy download en_core_web_sm && \
+    python3 -m spacy download en_core_web_lg
+
 COPY nlp/Gemfile .
 #TODO: Create gemspec for ferret
 COPY gems/ferret-0.11.9.0.gem .