Skip to content

Commit 3ca1ecb

Browse files
SgrAlphaSgrAlpha
committed
merge from master
2 parents bacbae4 + 0587d88 commit 3ca1ecb

File tree

6 files changed

+46
-48
lines changed

6 files changed

+46
-48
lines changed

‎README.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
## Customized Docker images of Java 8/11/14
1+
## Customized Docker images of Java 8/11/14/15
22

33
### Branches
44

55
* Active branches:
6-
* `master` - Latest Java, currently version 14.0.2
6+
* `master` - Latest Java, currently version 15.0.2
77
* Inactive branches:
88
* `java11` - Java 11
99
* `java8` - Java 8
1010
* Deprecated:
11+
* `java14`
1112
* `java13`
1213
* `java12`
1314
* `java10`
@@ -28,14 +29,14 @@
2829

2930
* Default
3031
* [![](https://images.microbadger.com/badges/image/sgrio/java.svg)](https://microbadger.com/images/sgrio/java) **latest**: pointed to `sgrio/java:latest_alpine`
31-
* [![](https://images.microbadger.com/badges/image/sgrio/java:latest_alpine.svg)](https://microbadger.com/images/sgrio/java:latest_alpine) **latest_alpine**: pointed to `sgrio/java:jdk_14_alpine`
32-
* [![](https://images.microbadger.com/badges/image/sgrio/java:latest_centos.svg)](https://microbadger.com/images/sgrio/java:latest_centos) **latest_centos**: pointed to `sgrio/java:jdk_14_centos`
33-
* [![](https://images.microbadger.com/badges/image/sgrio/java:latest_ubuntu.svg)](https://microbadger.com/images/sgrio/java:latest_ubuntu) **latest_ubuntu**: pointed to `sgrio/java:jdk_14_ubuntu`
34-
* Java 14
35-
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_14.svg)](https://microbadger.com/images/sgrio/java:jdk_14) **jdk_14**: pointed to `jdk_14_alpine`
36-
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_14_alpine.svg)](https://microbadger.com/images/sgrio/java:jdk_14_alpine) **jdk_14_alpine**: `Oracle Java SE Development Kit 14.0.2 build 12` on top of **Alpine Linux**
37-
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_14_centos.svg)](https://microbadger.com/images/sgrio/java:jdk_14_centos) **jdk_14_centos**: `Oracle Java SE Development Kit 14.0.2 build 12` on top of **CentOS**
38-
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_14_ubuntu.svg)](https://microbadger.com/images/sgrio/java:jdk_14_ubuntu) **jdk_14_ubuntu**: `Oracle Java SE Development Kit 14.0.2 build 12` on top of **Ubuntu**
32+
* [![](https://images.microbadger.com/badges/image/sgrio/java:latest_alpine.svg)](https://microbadger.com/images/sgrio/java:latest_alpine) **latest_alpine**: pointed to `sgrio/java:jdk_15_alpine`
33+
* [![](https://images.microbadger.com/badges/image/sgrio/java:latest_centos.svg)](https://microbadger.com/images/sgrio/java:latest_centos) **latest_centos**: pointed to `sgrio/java:jdk_15_centos`
34+
* [![](https://images.microbadger.com/badges/image/sgrio/java:latest_ubuntu.svg)](https://microbadger.com/images/sgrio/java:latest_ubuntu) **latest_ubuntu**: pointed to `sgrio/java:jdk_15_ubuntu`
35+
* Java 15
36+
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_15.svg)](https://microbadger.com/images/sgrio/java:jdk_15) **jdk_15**: pointed to `jdk_15_alpine`
37+
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_15_alpine.svg)](https://microbadger.com/images/sgrio/java:jdk_15_alpine) **jdk_15_alpine**: `Oracle Java SE Development Kit 15.0.2 build 9` on top of **Alpine Linux**
38+
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_15_centos.svg)](https://microbadger.com/images/sgrio/java:jdk_15_centos) **jdk_15_centos**: `Oracle Java SE Development Kit 15.0.2 build 9` on top of **CentOS**
39+
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_15_ubuntu.svg)](https://microbadger.com/images/sgrio/java:jdk_15_ubuntu) **jdk_15_ubuntu**: `Oracle Java SE Development Kit 15.0.2 build 9` on top of **Ubuntu**
3940
* Java 11
4041
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_11.svg)](https://microbadger.com/images/sgrio/java:jdk_11) **jdk_11**: pointed to `jdk_11_alpine`
4142
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_11_alpine.svg)](https://microbadger.com/images/sgrio/java:jdk_11_alpine) **jdk_11_alpine**: `Oracle Java SE Development Kit 11.0.2 build 9` on top of **Alpine Linux**

‎alpine/jdk/Dockerfile

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ FROM alpine:latest
22
MAINTAINER SgrAlpha <admin@mail.sgr.io>
33

44
ENV JAVA_HOME=/usr/lib/jvm/java-15-oracle \
5-
PATH="/usr/lib/jvm/java-14-oracle/bin:$PATH"
5+
PATH="/usr/lib/jvm/java-15-oracle/bin:$PATH"
66

77
RUN GLIBC_VERSION=2.31-r0 && \
8-
GCC_LIBS_VERSION=9.2.0-4 && \
98
ZLIB_VERSION=1.2.11-4 && \
109
JAVA_VERSION=15.0.2 && \
1110
JAVA_BUILD=7 && \
@@ -15,11 +14,6 @@ RUN GLIBC_VERSION=2.31-r0 && \
1514
curl -Ls https://github.com/sgerrand/alpine-pkg-glibc/releases/download/"${GLIBC_VERSION}"/glibc-"${GLIBC_VERSION}".apk \
1615
-o /tmp/glibc-"${GLIBC_VERSION}".apk && \
1716
apk add /tmp/glibc-"${GLIBC_VERSION}".apk && \
18-
mkdir /tmp/gcc-libs && \
19-
curl -Ls https://archive.archlinux.org/packages/g/gcc-libs/gcc-libs-"${GCC_LIBS_VERSION}"-x86_64.pkg.tar.xz \
20-
| tar -xJ -C /tmp/gcc-libs && \
21-
mv /tmp/gcc-libs/usr/lib/libgcc* /tmp/gcc-libs/usr/lib/libstdc++* /usr/glibc-compat/lib && \
22-
strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so* && \
2317
mkdir /tmp/zlib && \
2418
curl -Ls https://archive.archlinux.org/packages/z/zlib/zlib-1%3A"${ZLIB_VERSION}"-x86_64.pkg.tar.xz \
2519
| tar -xJ -C /tmp/zlib && \

‎alpine/jdk/README.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
## Customized Docker images of Java 8/11/14
1+
## Customized Docker images of Java 8/11/14/15
22

33
### Branches
44

55
* Active branches:
6-
* `master` - Latest Java, currently version 14.0.2
6+
* `master` - Latest Java, currently version 15.0.2
77
* Inactive branches:
88
* `java11` - Java 11
99
* `java8` - Java 8
1010
* Deprecated:
11+
* `java14`
1112
* `java13`
1213
* `java12`
1314
* `java10`
@@ -28,14 +29,14 @@
2829

2930
* Default
3031
* [![](https://images.microbadger.com/badges/image/sgrio/java.svg)](https://microbadger.com/images/sgrio/java) **latest**: pointed to `sgrio/java:latest_alpine`
31-
* [![](https://images.microbadger.com/badges/image/sgrio/java:latest_alpine.svg)](https://microbadger.com/images/sgrio/java:latest_alpine) **latest_alpine**: pointed to `sgrio/java:jdk_14_alpine`
32-
* [![](https://images.microbadger.com/badges/image/sgrio/java:latest_centos.svg)](https://microbadger.com/images/sgrio/java:latest_centos) **latest_centos**: pointed to `sgrio/java:jdk_14_centos`
33-
* [![](https://images.microbadger.com/badges/image/sgrio/java:latest_ubuntu.svg)](https://microbadger.com/images/sgrio/java:latest_ubuntu) **latest_ubuntu**: pointed to `sgrio/java:jdk_14_ubuntu`
34-
* Java 14
35-
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_14.svg)](https://microbadger.com/images/sgrio/java:jdk_14) **jdk_14**: pointed to `jdk_14_alpine`
36-
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_14_alpine.svg)](https://microbadger.com/images/sgrio/java:jdk_14_alpine) **jdk_14_alpine**: `Oracle Java SE Development Kit 14.0.2 build 12` on top of **Alpine Linux**
37-
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_14_centos.svg)](https://microbadger.com/images/sgrio/java:jdk_14_centos) **jdk_14_centos**: `Oracle Java SE Development Kit 14.0.2 build 12` on top of **CentOS**
38-
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_14_ubuntu.svg)](https://microbadger.com/images/sgrio/java:jdk_14_ubuntu) **jdk_14_ubuntu**: `Oracle Java SE Development Kit 14.0.2 build 12` on top of **Ubuntu**
32+
* [![](https://images.microbadger.com/badges/image/sgrio/java:latest_alpine.svg)](https://microbadger.com/images/sgrio/java:latest_alpine) **latest_alpine**: pointed to `sgrio/java:jdk_15_alpine`
33+
* [![](https://images.microbadger.com/badges/image/sgrio/java:latest_centos.svg)](https://microbadger.com/images/sgrio/java:latest_centos) **latest_centos**: pointed to `sgrio/java:jdk_15_centos`
34+
* [![](https://images.microbadger.com/badges/image/sgrio/java:latest_ubuntu.svg)](https://microbadger.com/images/sgrio/java:latest_ubuntu) **latest_ubuntu**: pointed to `sgrio/java:jdk_15_ubuntu`
35+
* Java 15
36+
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_15.svg)](https://microbadger.com/images/sgrio/java:jdk_15) **jdk_15**: pointed to `jdk_15_alpine`
37+
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_15_alpine.svg)](https://microbadger.com/images/sgrio/java:jdk_15_alpine) **jdk_15_alpine**: `Oracle Java SE Development Kit 15.0.2 build 9` on top of **Alpine Linux**
38+
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_15_centos.svg)](https://microbadger.com/images/sgrio/java:jdk_15_centos) **jdk_15_centos**: `Oracle Java SE Development Kit 15.0.2 build 9` on top of **CentOS**
39+
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_15_ubuntu.svg)](https://microbadger.com/images/sgrio/java:jdk_15_ubuntu) **jdk_15_ubuntu**: `Oracle Java SE Development Kit 15.0.2 build 9` on top of **Ubuntu**
3940
* Java 11
4041
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_11.svg)](https://microbadger.com/images/sgrio/java:jdk_11) **jdk_11**: pointed to `jdk_11_alpine`
4142
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_11_alpine.svg)](https://microbadger.com/images/sgrio/java:jdk_11_alpine) **jdk_11_alpine**: `Oracle Java SE Development Kit 11.0.2 build 9` on top of **Alpine Linux**

‎build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ docker pull ubuntu:latest
2121
docker build -t sgrio/java:jdk_15_ubuntu ubuntu/jdk/
2222
docker tag sgrio/java:jdk_15_ubuntu sgrio/java:latest_ubuntu
2323

24-
docker tag sgrio/java:jdk_15_alpine sgrio/java:jdk_14
24+
docker tag sgrio/java:jdk_15_alpine sgrio/java:jdk_15
2525
docker tag sgrio/java:jdk_15 sgrio/java:latest
2626

2727
docker push sgrio/java:jdk_15_alpine

‎centos/jdk/README.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
## Customized Docker images of Java 8/11/14
1+
## Customized Docker images of Java 8/11/14/15
22

33
### Branches
44

55
* Active branches:
6-
* `master` - Latest Java, currently version 14.0.2
6+
* `master` - Latest Java, currently version 15.0.2
77
* Inactive branches:
88
* `java11` - Java 11
99
* `java8` - Java 8
1010
* Deprecated:
11+
* `java14`
1112
* `java13`
1213
* `java12`
1314
* `java10`
@@ -28,14 +29,14 @@
2829

2930
* Default
3031
* [![](https://images.microbadger.com/badges/image/sgrio/java.svg)](https://microbadger.com/images/sgrio/java) **latest**: pointed to `sgrio/java:latest_alpine`
31-
* [![](https://images.microbadger.com/badges/image/sgrio/java:latest_alpine.svg)](https://microbadger.com/images/sgrio/java:latest_alpine) **latest_alpine**: pointed to `sgrio/java:jdk_14_alpine`
32-
* [![](https://images.microbadger.com/badges/image/sgrio/java:latest_centos.svg)](https://microbadger.com/images/sgrio/java:latest_centos) **latest_centos**: pointed to `sgrio/java:jdk_14_centos`
33-
* [![](https://images.microbadger.com/badges/image/sgrio/java:latest_ubuntu.svg)](https://microbadger.com/images/sgrio/java:latest_ubuntu) **latest_ubuntu**: pointed to `sgrio/java:jdk_14_ubuntu`
34-
* Java 14
35-
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_14.svg)](https://microbadger.com/images/sgrio/java:jdk_14) **jdk_14**: pointed to `jdk_14_alpine`
36-
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_14_alpine.svg)](https://microbadger.com/images/sgrio/java:jdk_14_alpine) **jdk_14_alpine**: `Oracle Java SE Development Kit 14.0.2 build 12` on top of **Alpine Linux**
37-
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_14_centos.svg)](https://microbadger.com/images/sgrio/java:jdk_14_centos) **jdk_14_centos**: `Oracle Java SE Development Kit 14.0.2 build 12` on top of **CentOS**
38-
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_14_ubuntu.svg)](https://microbadger.com/images/sgrio/java:jdk_14_ubuntu) **jdk_14_ubuntu**: `Oracle Java SE Development Kit 14.0.2 build 12` on top of **Ubuntu**
32+
* [![](https://images.microbadger.com/badges/image/sgrio/java:latest_alpine.svg)](https://microbadger.com/images/sgrio/java:latest_alpine) **latest_alpine**: pointed to `sgrio/java:jdk_15_alpine`
33+
* [![](https://images.microbadger.com/badges/image/sgrio/java:latest_centos.svg)](https://microbadger.com/images/sgrio/java:latest_centos) **latest_centos**: pointed to `sgrio/java:jdk_15_centos`
34+
* [![](https://images.microbadger.com/badges/image/sgrio/java:latest_ubuntu.svg)](https://microbadger.com/images/sgrio/java:latest_ubuntu) **latest_ubuntu**: pointed to `sgrio/java:jdk_15_ubuntu`
35+
* Java 15
36+
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_15.svg)](https://microbadger.com/images/sgrio/java:jdk_15) **jdk_15**: pointed to `jdk_15_alpine`
37+
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_15_alpine.svg)](https://microbadger.com/images/sgrio/java:jdk_15_alpine) **jdk_15_alpine**: `Oracle Java SE Development Kit 15.0.2 build 9` on top of **Alpine Linux**
38+
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_15_centos.svg)](https://microbadger.com/images/sgrio/java:jdk_15_centos) **jdk_15_centos**: `Oracle Java SE Development Kit 15.0.2 build 9` on top of **CentOS**
39+
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_15_ubuntu.svg)](https://microbadger.com/images/sgrio/java:jdk_15_ubuntu) **jdk_15_ubuntu**: `Oracle Java SE Development Kit 15.0.2 build 9` on top of **Ubuntu**
3940
* Java 11
4041
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_11.svg)](https://microbadger.com/images/sgrio/java:jdk_11) **jdk_11**: pointed to `jdk_11_alpine`
4142
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_11_alpine.svg)](https://microbadger.com/images/sgrio/java:jdk_11_alpine) **jdk_11_alpine**: `Oracle Java SE Development Kit 11.0.2 build 9` on top of **Alpine Linux**

‎ubuntu/jdk/README.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
## Customized Docker images of Java 8/11/14
1+
## Customized Docker images of Java 8/11/14/15
22

33
### Branches
44

55
* Active branches:
6-
* `master` - Latest Java, currently version 14.0.2
6+
* `master` - Latest Java, currently version 15.0.2
77
* Inactive branches:
88
* `java11` - Java 11
99
* `java8` - Java 8
1010
* Deprecated:
11+
* `java14`
1112
* `java13`
1213
* `java12`
1314
* `java10`
@@ -28,14 +29,14 @@
2829

2930
* Default
3031
* [![](https://images.microbadger.com/badges/image/sgrio/java.svg)](https://microbadger.com/images/sgrio/java) **latest**: pointed to `sgrio/java:latest_alpine`
31-
* [![](https://images.microbadger.com/badges/image/sgrio/java:latest_alpine.svg)](https://microbadger.com/images/sgrio/java:latest_alpine) **latest_alpine**: pointed to `sgrio/java:jdk_14_alpine`
32-
* [![](https://images.microbadger.com/badges/image/sgrio/java:latest_centos.svg)](https://microbadger.com/images/sgrio/java:latest_centos) **latest_centos**: pointed to `sgrio/java:jdk_14_centos`
33-
* [![](https://images.microbadger.com/badges/image/sgrio/java:latest_ubuntu.svg)](https://microbadger.com/images/sgrio/java:latest_ubuntu) **latest_ubuntu**: pointed to `sgrio/java:jdk_14_ubuntu`
34-
* Java 14
35-
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_14.svg)](https://microbadger.com/images/sgrio/java:jdk_14) **jdk_14**: pointed to `jdk_14_alpine`
36-
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_14_alpine.svg)](https://microbadger.com/images/sgrio/java:jdk_14_alpine) **jdk_14_alpine**: `Oracle Java SE Development Kit 14.0.2 build 12` on top of **Alpine Linux**
37-
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_14_centos.svg)](https://microbadger.com/images/sgrio/java:jdk_14_centos) **jdk_14_centos**: `Oracle Java SE Development Kit 14.0.2 build 12` on top of **CentOS**
38-
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_14_ubuntu.svg)](https://microbadger.com/images/sgrio/java:jdk_14_ubuntu) **jdk_14_ubuntu**: `Oracle Java SE Development Kit 14.0.2 build 12` on top of **Ubuntu**
32+
* [![](https://images.microbadger.com/badges/image/sgrio/java:latest_alpine.svg)](https://microbadger.com/images/sgrio/java:latest_alpine) **latest_alpine**: pointed to `sgrio/java:jdk_15_alpine`
33+
* [![](https://images.microbadger.com/badges/image/sgrio/java:latest_centos.svg)](https://microbadger.com/images/sgrio/java:latest_centos) **latest_centos**: pointed to `sgrio/java:jdk_15_centos`
34+
* [![](https://images.microbadger.com/badges/image/sgrio/java:latest_ubuntu.svg)](https://microbadger.com/images/sgrio/java:latest_ubuntu) **latest_ubuntu**: pointed to `sgrio/java:jdk_15_ubuntu`
35+
* Java 15
36+
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_15.svg)](https://microbadger.com/images/sgrio/java:jdk_15) **jdk_15**: pointed to `jdk_15_alpine`
37+
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_15_alpine.svg)](https://microbadger.com/images/sgrio/java:jdk_15_alpine) **jdk_15_alpine**: `Oracle Java SE Development Kit 15.0.2 build 9` on top of **Alpine Linux**
38+
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_15_centos.svg)](https://microbadger.com/images/sgrio/java:jdk_15_centos) **jdk_15_centos**: `Oracle Java SE Development Kit 15.0.2 build 9` on top of **CentOS**
39+
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_15_ubuntu.svg)](https://microbadger.com/images/sgrio/java:jdk_15_ubuntu) **jdk_15_ubuntu**: `Oracle Java SE Development Kit 15.0.2 build 9` on top of **Ubuntu**
3940
* Java 11
4041
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_11.svg)](https://microbadger.com/images/sgrio/java:jdk_11) **jdk_11**: pointed to `jdk_11_alpine`
4142
* [![](https://images.microbadger.com/badges/image/sgrio/java:jdk_11_alpine.svg)](https://microbadger.com/images/sgrio/java:jdk_11_alpine) **jdk_11_alpine**: `Oracle Java SE Development Kit 11.0.2 build 9` on top of **Alpine Linux**

0 commit comments

Comments
 (0)