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

Commit

Permalink
Update Debian docker build with JDK11 and correct debian version (#3487)
Browse files Browse the repository at this point in the history
* Debian9 docker build fix

* Fix Debian docker build with JDK11

Co-authored-by: tahlia <tahlia@stormeye.io>
  • Loading branch information
windhamwong and tahlia committed Mar 12, 2020
1 parent 3ad24ad commit a63bd0f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
2 changes: 1 addition & 1 deletion docker/compile/Dockerfile.debian10
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN apt-get update && apt-get -y install \
libtool \
libtool-bin \
python \
python2.7-dev \
python-dev \
software-properties-common \
python-setuptools \
tree \
Expand Down
7 changes: 2 additions & 5 deletions docker/compile/Dockerfile.debian9
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.

FROM openjdk:8-jdk-slim
FROM openjdk:11-jdk-slim-stretch

# This is passed to the heron build command via the --config flag
ENV TARGET_PLATFORM debian
Expand All @@ -37,10 +37,7 @@ RUN apt-get update && apt-get -y install \
tree \
zip \
unzip \
wget \
openjdk-11-jdk-headless

ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
wget

RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/$bazelVersion/bazel-$bazelVersion-installer-linux-x86_64.sh \
&& chmod +x /tmp/bazel.sh \
Expand Down
7 changes: 3 additions & 4 deletions docker/dist/Dockerfile.dist.debian9
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,16 @@
# specific language governing permissions and limitations
# under the License.

FROM openjdk:8-jdk-slim
FROM openjdk:11-jdk-slim-stretch

RUN apt-get -y update && apt-get -y install \
netcat-openbsd \
python \
python3 \
python-dev \
unzip \
curl \
vim \
supervisor \
openjdk-11-jdk-headless && \
supervisor && \
apt-get clean all && \
rm -rf /var/lib/apt/lists/*

Expand Down

0 comments on commit a63bd0f

Please sign in to comment.