Skip to content
This repository has been archived by the owner on Feb 2, 2022. It is now read-only.

Update Ubuntu to 18.04 and PHP to 7.2 #214

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion recipes/cpp_gcc/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
11 changes: 5 additions & 6 deletions recipes/dotnet_core/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
21 changes: 10 additions & 11 deletions recipes/php/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,16 @@

FROM eclipse/stack-base:ubuntu

ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive
ENV CHE_MYSQL_PASSWORD=che
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 apt-get update && \
sudo apt-get install -y \
sudo DEBIAN_FRONTEND=noninteractive apt-get install -y \
apache2 \
php \
php-mcrypt \
php-curl \
php-mysql \
php-gd \
Expand All @@ -40,14 +39,14 @@ RUN sudo sed -i 's/\/var\/www\/html/\/projects/g' /etc/apache2/sites-available/
sudo a2enmod rewrite

# Install the Zend Debugger php module
RUN sudo wget http://repos.zend.com/zend-server/9.0.2/deb_apache2.4/pool/zend-server-php-7.0-common_9.0.2+b174_amd64.deb && \
dpkg-deb --fsys-tarfile zend-server-php-7.0-common_9.0.2+b174_amd64.deb | sudo tar -xf - --strip-components=7 ./usr/local/zend/lib/debugger/php-7.0.x/ZendDebugger.so && \
sudo rm zend-server-php-7.0-common_9.0.2+b174_amd64.deb && \
sudo mv ZendDebugger.so /usr/lib/php/20151012 && \
sudo sh -c 'echo "; configuration for php ZendDebugger module\n; priority=90\nzend_extension=ZendDebugger.so" > /etc/php/7.0/mods-available/zenddebugger.ini' && \
sudo ln -s ../../mods-available/zenddebugger.ini /etc/php/7.0/cli/conf.d/90-zenddebugger.ini && \
sudo ln -s ../../mods-available/zenddebugger.ini /etc/php/7.0/apache2/conf.d/90-zenddebugger.ini && \
sudo sed -i 's/;opcache.enable=0/opcache.enable=0/g' /etc/php/7.0/apache2/php.ini && \
RUN sudo wget http://repos.zend.com/zend-server/2018.0/deb_apache2.4/pool/zend-server-php-7.2-common_2018.0.0+b464_amd64.deb && \
dpkg-deb --fsys-tarfile zend-server-php-7.2-common_2018.0.0+b464_amd64.deb | sudo tar -xf - --strip-components=7 ./usr/local/zend/lib/debugger/php-7.2.x/ZendDebugger.so && \
sudo rm zend-server-php-7.2-common_2018.0.0+b464_amd64.deb && \
sudo mv ZendDebugger.so /usr/lib/php/20170718 && \
sudo sh -c 'echo "; configuration for php ZendDebugger module\n; priority=90\nzend_extension=ZendDebugger.so" > /etc/php/7.2/mods-available/zenddebugger.ini' && \
sudo ln -s ../../mods-available/zenddebugger.ini /etc/php/7.2/cli/conf.d/90-zenddebugger.ini && \
sudo ln -s ../../mods-available/zenddebugger.ini /etc/php/7.2/apache2/conf.d/90-zenddebugger.ini && \
sudo sed -i 's/;opcache.enable=0/opcache.enable=0/g' /etc/php/7.2/apache2/php.ini && \
sudo setcap 'cap_net_bind_service=+ep' /usr/sbin/apache2 && \
sudo chmod -R 777 /var/run/apache2 /var/lock/apache2 /var/log/apache2

Expand Down
2 changes: 1 addition & 1 deletion recipes/php/laravel/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM eclipse/php

RUN sudo apt-get update && \
sudo apt-get install php7.0-zip -y && \
sudo apt-get install php-zip -y && \
sudo composer global require "laravel/installer" && \
sudo apt-get -y clean && \
sudo rm -rf /var/lib/apt/lists/*
Expand Down
1 change: 0 additions & 1 deletion recipes/platformio/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion recipes/ruby_rails/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 - \
Expand Down
2 changes: 1 addition & 1 deletion recipes/selenium/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
6 changes: 3 additions & 3 deletions recipes/stack-base/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
# Contributors:
# Red Hat, Inc. - initial API and implementation

FROM ubuntu:16.04
FROM ubuntu:18.04

ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
ENV PATH=$JAVA_HOME/bin:$PATH
RUN apt-get update && \
apt-get -y install \
libcap2-bin \
locales \
rsync \
openssh-server \
Expand All @@ -25,7 +26,6 @@ RUN apt-get update && \
ca-certificates \
curl \
software-properties-common \
python-software-properties \
bash-completion && \
mkdir /var/run/sshd && \
sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd && \
Expand All @@ -39,7 +39,7 @@ RUN apt-get update && \
sudo apt-get install git subversion -y && \
apt-get clean && \
apt-get -y autoremove && \
sudo apt-get install openjdk-8-jdk-headless=8u171-b11-0ubuntu0.16.04.1 openjdk-8-source=8u171-b11-0ubuntu0.16.04.1 -y && \
sudo apt-get install openjdk-8-jdk-headless=8u181-b13-0ubuntu0.18.04.1 openjdk-8-source=8u181-b13-0ubuntu0.18.04.1 -y && \
sudo update-ca-certificates -f && \
sudo sudo /var/lib/dpkg/info/ca-certificates-java.postinst configure && \
apt-get -y clean && \
Expand Down
3 changes: 2 additions & 1 deletion recipes/ubuntu_go/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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/... && \
Expand Down
45 changes: 3 additions & 42 deletions recipes/ubuntu_python/2.7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 3 additions & 7 deletions recipes/ubuntu_python/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
5 changes: 1 addition & 4 deletions recipes/ubuntu_rlang/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion recipes/x11_vnc/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down