Fix stacks for Ubuntu 18.04

eclipse-che · Oct 17, 2018 · 02bf71a · 02bf71a
1 parent 15ea975
commit 02bf71a
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 66 deletions.
diff --git a/recipes/cpp_gcc/Dockerfile b/recipes/cpp_gcc/Dockerfile
@@ -11,7 +11,7 @@
 FROM eclipse/stack-base:ubuntu
 ENV CLANGD_VERSION="6.0"
 RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - && \
-    sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-${CLANGD_VERSION} main" && \
+    sudo apt-add-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-${CLANGD_VERSION} main" && \
     sudo apt-get update && \
     sudo apt-get install g++ gcc make gdb gdbserver clang-tools-${CLANGD_VERSION} -y && \
     sudo apt-get clean && \

diff --git a/recipes/dotnet_core/Dockerfile b/recipes/dotnet_core/Dockerfile
@@ -12,14 +12,13 @@ FROM eclipse/stack-base:ubuntu
 ENV OMISHARP_VERSION="1.31.1"
 ENV OMNISHARP_DOWNLOAD_URL="https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${OMISHARP_VERSION}/omnisharp-linux-x64.tar.gz"
 ENV CSHARP_LS_DIR=${HOME}/che/ls-csharp
-RUN sudo apt-get update && sudo apt-get install apt-transport-https -y && \
-    curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > ~/microsoft.gpg && \
-    sudo mv ~/microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg && \
-    sudo sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-xenial-prod xenial main" > /etc/apt/sources.list.d/dotnetdev.list' && \
-    sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
+RUN sudo apt-get update && \
+    sudo apt-key adv --keyserver packages.microsoft.com --recv-keys EB3E94ADBE1229CF && \
+    sudo apt-key adv --keyserver packages.microsoft.com --recv-keys 52E16F86FEE04B979B07E28DB02C46DF417A0893 && \
+    sudo sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list' && \
     sudo apt-get update && \
     sudo apt-get install -y \
-    dotnet-sdk-2.0.0 && \
+    dotnet-sdk-2.1.105 && \
     sudo apt-get -y clean && \
     sudo rm -rf /var/lib/apt/lists/* && \
     mkdir -p ${CSHARP_LS_DIR}

diff --git a/recipes/php/Dockerfile b/recipes/php/Dockerfile
@@ -16,7 +16,7 @@ ENV CHE_MYSQL_DB=che_db
 ENV CHE_MYSQL_USER=che
 ENV PHP_LS_VERSION=5.4.1
 # install php with a set of most widely used extensions
-RUN sudo DEBIAN_FRONTEND=noninteractive apt-get update && \
+RUN sudo apt-get update && \
     sudo DEBIAN_FRONTEND=noninteractive apt-get install -y \
     apache2 \
     php \

diff --git a/recipes/platformio/Dockerfile b/recipes/platformio/Dockerfile
@@ -1,3 +1,2 @@
 FROM eclipse/ubuntu_python:2.7
-RUN sudo apt-get update && sudo apt-get -y install python-pip
 RUN sudo pip install -U PlatformIO
diff --git a/recipes/ruby_rails/Dockerfile b/recipes/ruby_rails/Dockerfile
@@ -32,7 +32,7 @@ RUN set -ex \
 	ruby \
     ' \
     && sudo apt-get update \
-    && sudo apt-get install -y --no-install-recommends make gcc zlib1g-dev autoconf build-essential libssl-dev libsqlite3-dev $buildDeps tzdata \
+    && sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends make gcc zlib1g-dev autoconf build-essential libssl-dev libsqlite3-dev $buildDeps tzdata \
     && sudo rm -rf /var/lib/apt/lists/* \
     && sudo curl -fSL -o ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \
     && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \

diff --git a/recipes/selenium/Dockerfile b/recipes/selenium/Dockerfile
@@ -26,7 +26,7 @@ RUN echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/so
 USER user
 
 RUN sudo apt-get update -qqy && \
-  sudo apt-get -qqy install \
+  sudo DEBIAN_FRONTEND=noninteractive apt-get -qqy install \
   google-chrome-stable \
   supervisor \
   x11vnc \

diff --git a/recipes/ubuntu_go/Dockerfile b/recipes/ubuntu_go/Dockerfile
@@ -6,6 +6,7 @@ RUN curl -sL https://deb.nodesource.com/setup_6.x | sudo bash - && \
     libc6-dev \
     make \
     nodejs \
+    npm \
     && sudo rm -rf /var/lib/apt/lists/*
 ENV GOLANG_VERSION 1.10.2
 ENV GOLANG_LS_VERSION="0.1.7"
@@ -34,7 +35,7 @@ RUN sudo curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
     go get -v github.com/zmb3/gogetdoc && \
     go get -v golang.org/x/tools/cmd/goimports && \
     go get -v sourcegraph.com/sqs/goreturns && \
-    go get -v github.com/golang/lint/golint && \
+    go get -v golang.org/x/lint/golint && \
     go get -v github.com/cweill/gotests/... && \
     go get -v github.com/alecthomas/gometalinter && \
     go get -v honnef.co/go/tools/... && \

diff --git a/recipes/ubuntu_python/2.7/Dockerfile b/recipes/ubuntu_python/2.7/Dockerfile
@@ -10,47 +10,8 @@
 
 FROM eclipse/stack-base:ubuntu
 
-# remove several traces of debian python
-RUN sudo apt-get purge -y python.* && \
-    sudo apt-get update && \
-    sudo apt-get install -y gcc make python-pip zlibc zlib1g zlib1g-dev libssl-dev
-
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
-# gpg: key 18ADD4FF: public key "Benjamin Peterson <[email protected]>" imported
-ENV GPG_KEY C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF
-
-ENV PYTHON_VERSION 2.7.11
-
-# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
-ENV PYTHON_PIP_VERSION 9.0.1
-
-RUN set -ex \
-    && sudo curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
-    && sudo curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
-    && export GNUPGHOME="$(mktemp -d)" \
-    && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
-    && gpg --batch --verify python.tar.xz.asc python.tar.xz \
-    && sudo rm -r "$GNUPGHOME" python.tar.xz.asc \
-    && sudo mkdir -p /usr/src/python \
-    && sudo tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
-    && sudo rm python.tar.xz \
-    \
-    && cd /usr/src/python \
-    && sudo ./configure --enable-shared --enable-unicode=ucs4 \
-    && sudo make -j$(nproc) \
-    && sudo make install \
-    && sudo ldconfig \
-    && sudo curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | sudo python2 \
-    && sudo pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
-    && sudo find /usr/local \
-         \( -type d -a -name test -o -name tests \) \
-         -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
-         -exec rm -rf '{}' + \
-    && sudo rm -rf /usr/src/python
-
-# install "virtualenv", since the vast majority of users of this image will want it
+RUN sudo apt-get update && \
+    sudo apt-get install -y gcc make zlibc zlib1g zlib1g-dev libssl-dev && \
+    sudo apt-get install -y python python-pip
 RUN sudo pip install --no-cache-dir virtualenv
 EXPOSE 8080
diff --git a/recipes/ubuntu_python/Dockerfile b/recipes/ubuntu_python/Dockerfile
@@ -11,13 +11,9 @@ RUN sudo apt-get purge -y python.* &&   sudo apt-get update &&   sudo apt-get in
     libc6-dev \
     libcurl4-openssl-dev libdb-dev libevent-dev libffi-dev libgdbm-dev libgeoip-dev libglib2.0-dev libjpeg-dev \
     libkrb5-dev liblzma-dev libmagickcore-dev libmagickwand-dev libmysqlclient-dev libncurses-dev libpng-dev \
-    libpq-dev libreadline-dev libsqlite3-dev libssl-dev libtool libwebp-dev libxml2-dev libxslt-dev libyaml-dev make patch xz-utils zlib1g-dev
-ENV LANG=C.UTF-8
-ENV GPG_KEY=97FC712E4C024BBEA48A61ED3A5CA953F73C700D
-ENV PYTHON_VERSION=3.5.1
-ENV PYTHON_PIP_VERSION=9.0.1
-RUN set -ex && sudo curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz && sudo curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc && export GNUPGHOME="$(mktemp -d)" && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" && gpg --batch --verify python.tar.xz.asc python.tar.xz && sudo rm -r "$GNUPGHOME" python.tar.xz.asc && sudo mkdir -p /usr/src/python && sudo tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz && sudo rm python.tar.xz && cd /usr/src/python && sudo ./configure --enable-shared --enable-unicode=ucs4 && sudo make -j$(nproc) && sudo make install && sudo ldconfig && sudo pip3 install --upgrade --ignore-installed pip==$PYTHON_PIP_VERSION && sudo find /usr/local \( -type d -a -name test -o -name tests \) -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -rf '{}' + && sudo rm -rf /usr/src/python
-RUN cd /usr/local/bin && sudo ln -s easy_install-3.5 easy_install && sudo ln -s idle3 idle && sudo ln -s pydoc3 pydoc && sudo ln -s python3 python && sudo ln -s python-config3 python-config
+    libpq-dev libreadline-dev libsqlite3-dev libssl-dev libtool libwebp-dev libxml2-dev libxslt-dev libyaml-dev make patch xz-utils zlib1g-dev && \
+    sudo apt-get install -y python3 python3-pip
+RUN cd /usr/bin && sudo ln -s python3 python && sudo ln -s pip3 pip
 RUN sudo pip install --upgrade pip && \
     sudo pip install --no-cache-dir virtualenv && \
     sudo pip install --upgrade setuptools && \

diff --git a/recipes/ubuntu_rlang/Dockerfile b/recipes/ubuntu_rlang/Dockerfile
@@ -11,10 +11,7 @@ FROM eclipse/stack-base:ubuntu
 
 RUN sudo apt-get update && \
     sudo apt-get -y install apt-transport-https build-essential libkrb5-dev gcc make debian-keyring python2.7 && \
-    sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9 && \
-    sudo add-apt-repository 'deb [arch=amd64,i386] https://cran.rstudio.com/bin/linux/ubuntu xenial/' && \
-    sudo apt-get update && \
-    sudo apt-get install -y r-base
+    sudo DEBIAN_FRONTEND=noninteractive apt-get install -y r-base
 
 EXPOSE 1337 3000 4200 5000 9000 8003
 LABEL che:server:8003:ref=angular che:server:8003:protocol=http che:server:3000:ref=node-3000 che:server:3000:protocol=http che:server:9000:ref=node-9000 che:server:9000:protocol=http    
diff --git a/recipes/x11_vnc/Dockerfile b/recipes/x11_vnc/Dockerfile
@@ -11,7 +11,7 @@
 FROM eclipse/ubuntu_jdk8
 
 RUN sudo apt-get update && \
-    sudo apt-get install -y --no-install-recommends supervisor x11vnc xvfb net-tools blackbox rxvt-unicode xfonts-terminus libxi6 libgconf-2-4
+    sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends supervisor x11vnc xvfb net-tools blackbox rxvt-unicode xfonts-terminus libxi6 libgconf-2-4
 
 # download and install noVNC