Merge branch 'master' into asalikhov/automatic_conda_versioning

This commit is contained in:
Ayaz Salikhov
2021-06-23 19:01:14 +03:00
2 changed files with 2 additions and 3 deletions

View File

@@ -14,9 +14,9 @@ USER root
# Default values can be overridden at build time # Default values can be overridden at build time
# (ARGS are in lower case to distinguish them from ENV) # (ARGS are in lower case to distinguish them from ENV)
# Check https://julialang.org/downloads/ # Check https://julialang.org/downloads/
ARG julia_version="1.6.0" ARG julia_version="1.6.1"
# SHA256 checksum # SHA256 checksum
ARG julia_checksum="463b71dc70ca7094c0e0fd6d55d130051a7901e8dec5eb44d6002c57d1bd8585" ARG julia_checksum="7c888adec3ea42afbfed2ce756ce1164a570d50fa7506c3f2e1e2cbc49d52506"
# R pre-requisites # R pre-requisites
RUN apt-get update --yes && \ RUN apt-get update --yes && \

View File

@@ -10,7 +10,6 @@ USER root
# Install all OS dependencies for fully functional notebook server # Install all OS dependencies for fully functional notebook server
RUN apt-get update --yes && \ RUN apt-get update --yes && \
apt-get install --yes --no-install-recommends \ apt-get install --yes --no-install-recommends \
build-essential \
vim-tiny \ vim-tiny \
git \ git \
inkscape \ inkscape \