From 90eaa6f732c2b6adc57472b70bd192d39f0881d2 Mon Sep 17 00:00:00 2001 From: Menaka Jayawardena Date: Thu, 8 Apr 2021 18:32:01 +0530 Subject: [PATCH 1/4] Add docker base image upgrade command to router Dockerfile --- router/src/main/resources/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/router/src/main/resources/Dockerfile b/router/src/main/resources/Dockerfile index b3a00727c1..e59a3c7882 100644 --- a/router/src/main/resources/Dockerfile +++ b/router/src/main/resources/Dockerfile @@ -30,6 +30,9 @@ ARG MOTD="\n\ which is under the Apache License, Version 2.0. \n\ Read more about Apache License, Version 2.0 here @ http://www.apache.org/licenses/LICENSE-2.0.\n" +# Updrade the base os +RUN apk upgrade + RUN \ addgroup -S -g ${MG_USER_GROUP_ID} ${MG_USER_GROUP} \ && adduser -S -u ${MG_USER_ID} -h ${MG_USER_HOME} -G ${MG_USER_GROUP} ${MG_USER} \ From 98357810a11a6bcf8da18b232706a7c0e5ab9fb0 Mon Sep 17 00:00:00 2001 From: Menaka Jayawardena Date: Fri, 9 Apr 2021 00:09:39 +0530 Subject: [PATCH 2/4] Update docker images with latest alpine versions --- enforcer/src/main/resources/Dockerfile | 4 +++- router/src/main/resources/Dockerfile | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/enforcer/src/main/resources/Dockerfile b/enforcer/src/main/resources/Dockerfile index a6e8c42cbc..feb1cdbbc5 100644 --- a/enforcer/src/main/resources/Dockerfile +++ b/enforcer/src/main/resources/Dockerfile @@ -15,7 +15,10 @@ # ----------------------------------------------------------------------- # TODO: (VirajSalaka) finalize jdk 11 image +FROM alpine:3.13.4 as alpine FROM adoptopenjdk/openjdk11:jre-11.0.10_9-alpine +COPY --from=alpine . . + LABEL maintainer="WSO2 Docker Maintainers " ENV LANG=C.UTF-8 @@ -56,7 +59,6 @@ RUN \ WORKDIR ${MG_USER_HOME} USER ${MG_USER} - COPY maven/ lib/ COPY maven/conf conf COPY maven/security security diff --git a/router/src/main/resources/Dockerfile b/router/src/main/resources/Dockerfile index e59a3c7882..63835945fd 100644 --- a/router/src/main/resources/Dockerfile +++ b/router/src/main/resources/Dockerfile @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # ----------------------------------------------------------------------- +FROM alpine:3.13.4 as alpine FROM envoyproxy/envoy-alpine:v1.17.1 +COPY --from=alpine . . ENV LANG=C.UTF-8 @@ -30,9 +32,6 @@ ARG MOTD="\n\ which is under the Apache License, Version 2.0. \n\ Read more about Apache License, Version 2.0 here @ http://www.apache.org/licenses/LICENSE-2.0.\n" -# Updrade the base os -RUN apk upgrade - RUN \ addgroup -S -g ${MG_USER_GROUP_ID} ${MG_USER_GROUP} \ && adduser -S -u ${MG_USER_ID} -h ${MG_USER_HOME} -G ${MG_USER_GROUP} ${MG_USER} \ From a04232b23018cdb2b0956e568709683e5bd7747c Mon Sep 17 00:00:00 2001 From: Menaka Jayawardena Date: Fri, 9 Apr 2021 12:38:28 +0530 Subject: [PATCH 3/4] Upgrade docker base os --- enforcer/src/main/resources/Dockerfile | 3 +-- router/src/main/resources/Dockerfile | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/enforcer/src/main/resources/Dockerfile b/enforcer/src/main/resources/Dockerfile index feb1cdbbc5..09ad2e8548 100644 --- a/enforcer/src/main/resources/Dockerfile +++ b/enforcer/src/main/resources/Dockerfile @@ -15,9 +15,8 @@ # ----------------------------------------------------------------------- # TODO: (VirajSalaka) finalize jdk 11 image -FROM alpine:3.13.4 as alpine FROM adoptopenjdk/openjdk11:jre-11.0.10_9-alpine -COPY --from=alpine . . +RUN apk update && apk upgrade --no-cache LABEL maintainer="WSO2 Docker Maintainers " diff --git a/router/src/main/resources/Dockerfile b/router/src/main/resources/Dockerfile index 63835945fd..dac7d9827d 100644 --- a/router/src/main/resources/Dockerfile +++ b/router/src/main/resources/Dockerfile @@ -13,9 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # ----------------------------------------------------------------------- -FROM alpine:3.13.4 as alpine FROM envoyproxy/envoy-alpine:v1.17.1 -COPY --from=alpine . . +RUN apk update && apk upgrade --no-cache ENV LANG=C.UTF-8 From 113dda8e0621376a02873f13f39ef602ca2bf636 Mon Sep 17 00:00:00 2001 From: Menaka Jayawardena Date: Fri, 9 Apr 2021 12:50:04 +0530 Subject: [PATCH 4/4] Rename k8s deployment and service file names --- .../{mg-deployment.yaml => choreo-connect-deployment.yaml} | 0 .../{mg-service.yaml => choreo-connect-service.yaml} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename resources/k8s-artifacts/choreo-connect/{mg-deployment.yaml => choreo-connect-deployment.yaml} (100%) rename resources/k8s-artifacts/choreo-connect/{mg-service.yaml => choreo-connect-service.yaml} (100%) diff --git a/resources/k8s-artifacts/choreo-connect/mg-deployment.yaml b/resources/k8s-artifacts/choreo-connect/choreo-connect-deployment.yaml similarity index 100% rename from resources/k8s-artifacts/choreo-connect/mg-deployment.yaml rename to resources/k8s-artifacts/choreo-connect/choreo-connect-deployment.yaml diff --git a/resources/k8s-artifacts/choreo-connect/mg-service.yaml b/resources/k8s-artifacts/choreo-connect/choreo-connect-service.yaml similarity index 100% rename from resources/k8s-artifacts/choreo-connect/mg-service.yaml rename to resources/k8s-artifacts/choreo-connect/choreo-connect-service.yaml