Skip to content
This repository was archived by the owner on Mar 3, 2023. It is now read-only.

Fix ubuntu16.04 docker file #3525

Merged
merged 2 commits into from
May 17, 2020
Merged
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
9 changes: 8 additions & 1 deletion docker/compile/Dockerfile.ubuntu16.04
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ FROM ubuntu:16.04
ENV TARGET_PLATFORM ubuntu
ENV bazelVersion 3.0.0

RUN apt-get update && apt-get install -y software-properties-common

RUN add-apt-repository ppa:openjdk-r/ppa

RUN apt-get update && apt-get -y install \
automake \
build-essential \
Expand All @@ -31,12 +35,15 @@ RUN apt-get update && apt-get -y install \
libtool-bin \
libunwind8 \
libunwind-setjmp0-dev \
pkg-config \
python-dev \
libcppunit-dev \
tree \
zip \
unzip \
wget \
wget

RUN apt-get update && apt-get -y install \
openjdk-11-jdk-headless

ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
Expand Down
8 changes: 6 additions & 2 deletions docker/dist/Dockerfile.dist.ubuntu16.04
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,19 @@

FROM ubuntu:16.04

RUN apt-get update
RUN apt-get update && apt-get install -y software-properties-common

RUN add-apt-repository ppa:openjdk-r/ppa

RUN apt-get -y install \
python \
python3 \
unzip \
software-properties-common \
curl \
supervisor \
supervisor

RUN apt-get update && apt-get -y install \
openjdk-11-jdk-headless

ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
Expand Down