From 06f17a22454b088e35e6ffad21248ec0720f1175 Mon Sep 17 00:00:00 2001 From: Rakhitha Ranathunge Date: Fri, 21 Jan 2022 10:45:00 +0530 Subject: [PATCH] Update release version and add changelog --- CHANGELOG.md | 5 +++++ dockerfiles/alpine/apim-analytics/dashboard/Dockerfile | 5 ++--- dockerfiles/alpine/apim-analytics/worker/Dockerfile | 5 ++--- dockerfiles/alpine/apim/Dockerfile | 5 ++--- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 943e8c8d..674455fa 100644 --- 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 index 4cf6652f..c3359c42 100644 --- 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 " \ + 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 " \ - 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 index 0898320e..52e3ec1b 100644 --- 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 " \ + 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 " \ - 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 index 75504362..db850ae3 100644 --- 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 " \ + 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 " \ - 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