Merge pull request #425 from RakhithaRR/2.6.x-alpine-jdk

[2.6.x] Update release version and add changelog
wso2 · Jan 21, 2022 · 4884910 · 4884910
2 parents 001c3bd + 06f17a2
commit 4884910
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@ All notable changes to this project 2.6.x per each release will be documented in
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
+## [v2.6.0.18] - 2022-01-21
+
+### Changed
+- Update the base image of alpine based image to `alpine:3.15` and added `Adoptium OpenJDK8U-jdk_x64_linux_hotspot_8u312b07` as the JDK for the image.
+
 ## [v2.6.0.16] - 2021-12-01
 
 ### Changed

diff --git a/dockerfiles/alpine/apim-analytics/dashboard/Dockerfile b/dockerfiles/alpine/apim-analytics/dashboard/Dockerfile
@@ -18,6 +18,8 @@
 
 # set base Docker image to latest Alphine
 FROM alpine:3.15
+LABEL maintainer="WSO2 Docker Maintainers <dev@wso2.org>" \
+      com.wso2.docker.source="https://github.com/wso2/docker-apim/releases/tag/v2.6.0.18"
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -81,9 +83,6 @@ RUN set -eux; \
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
 
-LABEL maintainer="WSO2 Docker Maintainers <dev@wso2.org>" \
-      com.wso2.docker.source="https://github.com/wso2/docker-apim/releases/tag/v2.6.0.16"
-
 # set Docker image build arguments
 # build arguments for user/group configurations
 ARG USER=wso2carbon

diff --git a/dockerfiles/alpine/apim-analytics/worker/Dockerfile b/dockerfiles/alpine/apim-analytics/worker/Dockerfile
@@ -18,6 +18,8 @@
 
 # set base Docker image to latest Alphine
 FROM alpine:3.15
+LABEL maintainer="WSO2 Docker Maintainers <dev@wso2.org>" \
+      com.wso2.docker.source="https://github.com/wso2/docker-apim/releases/tag/v2.6.0.18"
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -81,9 +83,6 @@ RUN set -eux; \
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
 
-LABEL maintainer="WSO2 Docker Maintainers <dev@wso2.org>" \
-      com.wso2.docker.source="https://github.com/wso2/docker-apim/releases/tag/v2.6.0.16"
-
 # set Docker image build arguments
 # build arguments for user/group configurations
 ARG USER=wso2carbon

diff --git a/dockerfiles/alpine/apim/Dockerfile b/dockerfiles/alpine/apim/Dockerfile
@@ -18,6 +18,8 @@
 
 # set base Docker image to latest Alphine
 FROM alpine:3.15
+LABEL maintainer="WSO2 Docker Maintainers <dev@wso2.org>" \
+      com.wso2.docker.source="https://github.com/wso2/docker-apim/releases/tag/v2.6.0.18"
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
@@ -81,9 +83,6 @@ RUN set -eux; \
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
 
-LABEL maintainer="WSO2 Docker Maintainers <dev@wso2.org>" \
-      com.wso2.docker.source="https://github.com/wso2/docker-apim/releases/tag/v2.6.0.16"
-
 # set Docker image build arguments
 # build arguments for user/group configurations
 ARG USER=wso2carbon