fix(r): remove wrong spark/hadoop config (#162)

* fix(r): remove wrong spark/hadoop config * fix typo * fix typo
InseeFrLab · Dec 4, 2023 · 9e12a74 · 9e12a74
1 parent 03c91d3
commit 9e12a74
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/.github/workflows/main-workflow-template.yml b/.github/workflows/main-workflow-template.yml
@@ -177,7 +177,7 @@ jobs:
         shell: bash
 
       - name: Build and load to the Docker client
-        if: ${{ matrix.gpu != 'true' || inputs.branch == 'refs/heads/dev' }}
+        if: ${{ matrix.gpu != 'true' }}
         uses: docker/build-push-action@v5
         with:
           load: true

diff --git a/.github/workflows/main-workflow.yml b/.github/workflows/main-workflow.yml
@@ -3,7 +3,6 @@ name: Build and push Docker images
 on:
   workflow_dispatch:
   schedule:
-  # every monday at 2am
     - cron: '0 1 * * 1'
 
 jobs:

diff --git a/dev/build-chain.py b/dev/build-chain.py
@@ -20,7 +20,7 @@
     "jupyter-pytorch": ["base", "python-minimal", "python-pytorch", "jupyter"],
     "jupyter-tensorflow": ["base", "python-minimal", "python-tensorflow", "jupyter"],
     "jupyter-pyspark": ["base", "python-minimal", "spark", "jupyter"],
-    "vscode": ["base", "python-minimal", "python-datascience", "vscode"],
+    "vscode-python": ["base", "python-minimal", "python-datascience", "vscode"],
     "vscode-minimal": ["base", "python-minimal", "vscode"],
     "r-python-julia": ["base", "r-minimal", "r-python-julia"],
     "vscode-r-python-julia": ["base", "r-minimal", "r-python-julia", "vscode"]
@@ -49,7 +49,12 @@
     else:
         device_suffix = ""
 
-    cmd = ["docker", "build", image, "-t", image,
+    if i < len(chain) - 1:
+        tag = image
+    else:
+        tag = f"inseefrlab/onyxia-{chain}:dev"
+
+    cmd = ["docker", "build", image, "-t", tag,
            "--build-arg", f"BASE_IMAGE={previous_image}",
            "--build-arg", f"DEVICE_SUFFIX={device_suffix}"]
     print(" ".join(cmd))

diff --git a/r-datascience/Dockerfile b/r-datascience/Dockerfile
@@ -6,12 +6,7 @@ LABEL maintainer="InseeFrLab <[email protected]>"
 USER root
 
 # Install additional libraries and R packages for datascience
-RUN napt-get update && \
-    apt-get install -y --no-install-recommends \
-        language-pack-fr \
-        libsecret-1-dev && \
-    # Install quarto
-    /opt/install-quarto.sh && \
+RUN /opt/install-quarto.sh && \
     # Install Shiny Server
     /rocker_scripts/install_shiny_server.sh && \
     # Install packages bundles from rocker

diff --git a/scripts/onyxia-init.sh b/scripts/onyxia-init.sh
@@ -141,8 +141,6 @@ if command -v R; then
     echo -e "SPARK_HOME=$SPARK_HOME" >> ${R_HOME}/etc/Renviron.site
     echo -e "HADOOP_HOME=$HADOOP_HOME" >> ${R_HOME}/etc/Renviron.site
     echo -e "HADOOP_OPTIONAL_TOOLS=$HADOOP_OPTIONAL_TOOLS" >> ${R_HOME}/etc/Renviron.site
-    echo -e "PATH=$JAVA_HOME/bin:$SPARK_HOME/bin:$HADOOP_HOME/bin:$PATH" >> /etc/environment
-    echo -e "export PATH=$JAVA_HOME/bin:$SPARK_HOME/bin:$HADOOP_HOME/bin:$PATH" >> /etc/profile
     if [[ -e "/usr/lib/jvm/adoptopenjdk-8-hotspot-amd64" ]]; then
         echo -e "JAVA_HOME=/usr/lib/jvm/adoptopenjdk-8-hotspot-amd64" >> ${R_HOME}/etc/Renviron.site
     fi