diff --git a/images/full/Dockerfile b/images/full/Dockerfile index 9651df3..e07f8f8 100644 --- a/images/full/Dockerfile +++ b/images/full/Dockerfile @@ -6,7 +6,7 @@ FROM ${registry}:${parent_image}-${tag_name} ARG tag_name ARG image_name="full" -ARG julia_version="1.5.0" +ARG julia_version="1.0.5" USER root @@ -38,9 +38,8 @@ RUN mkdir /etc/julia && \ chown "${NB_USER}" "${JULIA_PKGDIR}" && \ fix-permissions "${JULIA_PKGDIR}" -COPY install.jl /tmp/install.jl -RUN julia -e "include(\"/tmp/install.jl\");" - +RUN julia -e "using Pkg; Pkg.update(); Pkg.add(\"IJulia\")" && \ + julia -e "using IJulia" # move kernelspec out of home to the system share location \ RUN mv "${HOME}/.local/share/jupyter/kernels/julia"* "${CONDA_DIR}/share/jupyter/kernels/" && \ diff --git a/images/teichlab/Dockerfile b/images/teichlab/Dockerfile index 2908203..6563fb7 100644 --- a/images/teichlab/Dockerfile +++ b/images/teichlab/Dockerfile @@ -4,6 +4,9 @@ ARG registry="quay.io/cellgeni/jupyter" FROM $registry:$parent_image-$tag_name +ARG tag_name +ARG image_name="teichlab" + USER root # general OS packages @@ -33,7 +36,7 @@ RUN fix-permissions $CONDA_DIR && \ fix-permissions /usr/lib/R/ && \ fix-permissions /usr/local/lib/R/site-library -RUN echo "$image_name=$tag_name" >> /sanger/image.info && \ +RUN echo "$image_name=$tag_name" > /sanger/image.info && \ conda list > /sanger/conda.info && \ Rscript -e "as.data.frame(installed.packages()[,c(1,3:4)])[,1:2,drop=FALSE]" > /sanger/r-packages.info