Skip to content

Commit

Permalink
Upgrading alpine version to 3.13 with glibc update
Browse files Browse the repository at this point in the history
Signed-off-by: bharathappali <[email protected]>
  • Loading branch information
bharathappali committed May 17, 2021
1 parent d8da3d9 commit 176d09c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Dockerfiles and build scripts for generating Docker Images based on various Adop

| Alpine | centos | clefos | debian | debianslim | leap | tumbleweed | ubi | ubi-minimal | ubuntu(*) |
|:------:|:------:|:------:|:------:|:------------:|:----:|:----------:|:---:|:-----------:|:------:|
| 3.12 | 7 | 7 | buster | buster-slim | 15.2 | latest | 8.2 | 8.2 | 20.04 |
| 3.13 | 7 | 7 | buster | buster-slim | 15.2 | latest | 8.2 | 8.2 | 20.04 |

Note: Hotspot is not supported on Ubuntu 20.04 for s390x arch.

Expand All @@ -34,7 +34,7 @@ AdoptOpenJDK Docker Images are available as both Official Images (Maintained by
- Windows Server Core (ltsc2016 and 1809): Release
* [Unofficial Images](https://hub.docker.com/u/adoptopenjdk) are maintained by AdoptOpenJDK and updated on a nightly basis. Supported OSes and their versions and type of images are as below.
- Linux
- Alpine (3.12): Release, Nightly and Slim
- Alpine (3.13): Release, Nightly and Slim
- CentOS (7): Release, Nightly and Slim
- ClefOS (7): Release, Nightly and Slim
- Debian (Buster): Release, Nightly and Slim
Expand Down
4 changes: 2 additions & 2 deletions dockerfile_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ EOI
# Print the supported Alpine OS
print_alpine_ver() {
cat >> "$1" <<-EOI
FROM alpine:3.12
FROM alpine:3.13
EOI
}
Expand Down Expand Up @@ -216,7 +216,7 @@ print_alpine_pkg() {
print_alpine_glibc_pkg() {
cat >> "$1" <<'EOI'
RUN apk add --no-cache tzdata --virtual .build-deps curl binutils zstd \
&& GLIBC_VER="2.31-r0" \
&& GLIBC_VER="2.33-r0" \
&& ALPINE_GLIBC_REPO="https://github.com/sgerrand/alpine-pkg-glibc/releases/download" \
&& GCC_LIBS_URL="https://archive.archlinux.org/packages/g/gcc-libs/gcc-libs-10.1.0-2-x86_64.pkg.tar.zst" \
&& GCC_LIBS_SHA256="f80320a03ff73e82271064e4f684cd58d7dbdb07aa06a2c4eea8e0f3c507c45c" \
Expand Down

0 comments on commit 176d09c

Please sign in to comment.