Skip to content

Commit 0492594

Browse files
author
Maik Hummel
committed
Switch to OpenJDK 8
1 parent 4a7dd4d commit 0492594

2 files changed

Lines changed: 26 additions & 19 deletions

File tree

Dockerfile

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,30 @@
11
FROM beevelop/base
22

3-
MAINTAINER Maik Hummel <[email protected]>
4-
5-
# required to use add-apt-repository
6-
RUN buildDeps='software-properties-common'; \
7-
set -x && \
8-
apt-get update && apt-get install -y $buildDeps --no-install-recommends && \
3+
ARG BUILD_DATE
4+
ARG BUILD_VERSION
5+
ARG VCS_REF
96

10-
# use WebUpd8 PPA
11-
add-apt-repository ppa:webupd8team/java -y && \
12-
apt-get update -y && \
7+
LABEL maintainer="Maik Hummel <[email protected]>" \
8+
org.label-schema.build-date=$BUILD_DATE \
9+
org.label-schema.version=$BUILD_VERSION \
10+
org.label-schema.vcs-ref=$VCS_REF \
11+
org.label-schema.schema-version="1.0.0-rc1" \
12+
org.label-schema.vcs-url="https://github.com/beevelop/docker-java.git" \
13+
org.label-schema.name="beevelop/java" \
14+
org.label-schema.vendor="Beevelop" \
15+
org.label-schema.description="Simple Java Docker image (used as base image)" \
16+
org.label-schema.url="https://beevelop.com/"
1317

14-
# automatically accept the Oracle license
15-
echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \
16-
apt-get install -y oracle-java8-installer && \
17-
apt-get install -y oracle-java8-set-default && \
18-
19-
# clean up
20-
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
21-
apt-get purge -y --auto-remove $buildDeps && \
22-
apt-get autoremove -y && apt-get clean
18+
# required to use add-apt-repository
19+
RUN buildDeps='software-properties-common'; \
20+
set -x && \
21+
apt-get update && apt-get install -y $buildDeps --no-install-recommends && \
22+
add-apt-repository ppa:openjdk-r/ppa -y && \
23+
apt-get update -y && \
24+
apt-get install -y openjdk-8-jdk && \
25+
java -version && \
26+
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
27+
apt-get purge -y --auto-remove $buildDeps && \
28+
apt-get autoremove -y && apt-get clean
2329

2430
ENV JAVA_HOME /usr/lib/jvm/java-8-oracle

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88

99

1010
![beevelop/java](/icon.png?raw=true)
11-
# Java 8 (1.8.0_111)
11+
# Java / OpenJDK 8 (1.8.0_222)
1212
### based on Ubuntu 16.04 (Xenial Xerus)
13+
> ⚠ This image formerly used the Oracle Java version. But due the license changes since April 2019, it's not longer feasible to rely on. This image is now using OpenJDK 8.
1314
----
1415
### Pull from Docker Hub
1516
```

0 commit comments

Comments
 (0)