From 384ce40bb897270c89fcc55a8753ce7c73400bd6 Mon Sep 17 00:00:00 2001 From: Bimsara Bodaragama Date: Wed, 24 Jul 2024 09:58:58 +0530 Subject: [PATCH 1/2] Remove K8S_MEMBERSHIP_SCHEME_VERSION from docker-is-6.0.x --- dockerfiles/alpine/is/Dockerfile | 2 -- dockerfiles/centos/is/Dockerfile | 2 -- dockerfiles/ubuntu/is/Dockerfile | 2 -- 3 files changed, 6 deletions(-) diff --git a/dockerfiles/alpine/is/Dockerfile b/dockerfiles/alpine/is/Dockerfile index 4bed6d78..d891763c 100755 --- a/dockerfiles/alpine/is/Dockerfile +++ b/dockerfiles/alpine/is/Dockerfile @@ -74,7 +74,6 @@ ARG WSO2_SERVER_HOME=${USER_HOME}/${WSO2_SERVER} ARG WSO2_SERVER_DIST_URL="" # build arguments for external artifacts ARG DNS_JAVA_VERSION=2.1.8 -ARG K8S_MEMBERSHIP_SCHEME_VERSION=1.0.9 # build argument for MOTD ARG MOTD='printf "\n\ Welcome to WSO2 Docker Resources \n\ @@ -115,7 +114,6 @@ RUN \ # add libraries for Kubernetes membership scheme based clustering ADD --chown=wso2carbon:wso2 https://repo1.maven.org/maven2/dnsjava/dnsjava/${DNS_JAVA_VERSION}/dnsjava-${DNS_JAVA_VERSION}.jar ${WSO2_SERVER_HOME}/repository/components/lib -ADD --chown=wso2carbon:wso2 http://maven.wso2.org/nexus/content/repositories/releases/org/wso2/carbon/kubernetes/artifacts/kubernetes-membership-scheme/${K8S_MEMBERSHIP_SCHEME_VERSION}/kubernetes-membership-scheme-${K8S_MEMBERSHIP_SCHEME_VERSION}.jar ${WSO2_SERVER_HOME}/repository/components/dropins # set the user and work directory USER ${USER_ID} diff --git a/dockerfiles/centos/is/Dockerfile b/dockerfiles/centos/is/Dockerfile index 0431cb2b..c7b14509 100755 --- a/dockerfiles/centos/is/Dockerfile +++ b/dockerfiles/centos/is/Dockerfile @@ -69,7 +69,6 @@ ARG WSO2_SERVER_HOME=${USER_HOME}/${WSO2_SERVER} ARG WSO2_SERVER_DIST_URL="" # build arguments for external artifacts ARG DNS_JAVA_VERSION=2.1.8 -ARG K8S_MEMBERSHIP_SCHEME_VERSION=1.0.9 # build argument for MOTD ARG MOTD='printf "\n\ Welcome to WSO2 Docker resources.\n\ @@ -111,7 +110,6 @@ RUN \ # add libraries for Kubernetes membership scheme based clustering ADD --chown=wso2carbon:wso2 https://repo1.maven.org/maven2/dnsjava/dnsjava/${DNS_JAVA_VERSION}/dnsjava-${DNS_JAVA_VERSION}.jar ${WSO2_SERVER_HOME}/repository/components/lib -ADD --chown=wso2carbon:wso2 http://maven.wso2.org/nexus/content/repositories/releases/org/wso2/carbon/kubernetes/artifacts/kubernetes-membership-scheme/${K8S_MEMBERSHIP_SCHEME_VERSION}/kubernetes-membership-scheme-${K8S_MEMBERSHIP_SCHEME_VERSION}.jar ${WSO2_SERVER_HOME}/repository/components/dropins # set the user and work directory USER ${USER_ID} diff --git a/dockerfiles/ubuntu/is/Dockerfile b/dockerfiles/ubuntu/is/Dockerfile index d8456712..19fd5db3 100755 --- a/dockerfiles/ubuntu/is/Dockerfile +++ b/dockerfiles/ubuntu/is/Dockerfile @@ -73,7 +73,6 @@ ARG WSO2_SERVER=${WSO2_SERVER_NAME}-${WSO2_SERVER_VERSION} ARG WSO2_SERVER_HOME=${USER_HOME}/${WSO2_SERVER} # build arguments for external artifacts ARG DNS_JAVA_VERSION=2.1.8 -ARG K8S_MEMBERSHIP_SCHEME_VERSION=1.0.9 # build argument for MOTD ARG MOTD="\n\ Welcome to WSO2 Docker resources.\n\ @@ -116,7 +115,6 @@ RUN \ # add libraries for Kubernetes membership scheme based clustering ADD --chown=wso2carbon:wso2 https://repo1.maven.org/maven2/dnsjava/dnsjava/${DNS_JAVA_VERSION}/dnsjava-${DNS_JAVA_VERSION}.jar ${WSO2_SERVER_HOME}/repository/components/lib -ADD --chown=wso2carbon:wso2 http://maven.wso2.org/nexus/content/repositories/releases/org/wso2/carbon/kubernetes/artifacts/kubernetes-membership-scheme/${K8S_MEMBERSHIP_SCHEME_VERSION}/kubernetes-membership-scheme-${K8S_MEMBERSHIP_SCHEME_VERSION}.jar ${WSO2_SERVER_HOME}/repository/components/dropins # set the user and work directory USER ${USER_ID} From bbc5098da17ded6efd6b75fa416157b6c6b229b1 Mon Sep 17 00:00:00 2001 From: Bimsara Bodaragama Date: Tue, 6 Aug 2024 15:03:32 +0530 Subject: [PATCH 2/2] Remove K8S_MEMBERSHIP_SCHEME_VERSION from docker-is-6.0.x-rocky --- dockerfiles/rocky/is/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/dockerfiles/rocky/is/Dockerfile b/dockerfiles/rocky/is/Dockerfile index 38b7bed7..1dcad712 100755 --- a/dockerfiles/rocky/is/Dockerfile +++ b/dockerfiles/rocky/is/Dockerfile @@ -83,7 +83,6 @@ ARG WSO2_SERVER_HOME=${USER_HOME}/${WSO2_SERVER} ARG WSO2_SERVER_DIST_URL="" # build arguments for external artifacts ARG DNS_JAVA_VERSION=2.1.8 -ARG K8S_MEMBERSHIP_SCHEME_VERSION=1.0.9 # build argument for MOTD ARG MOTD='printf "\n\ Welcome to WSO2 Docker resources.\n\ @@ -125,7 +124,6 @@ RUN \ # add libraries for Kubernetes membership scheme based clustering ADD --chown=wso2carbon:wso2 https://repo1.maven.org/maven2/dnsjava/dnsjava/${DNS_JAVA_VERSION}/dnsjava-${DNS_JAVA_VERSION}.jar ${WSO2_SERVER_HOME}/repository/components/lib -ADD --chown=wso2carbon:wso2 http://maven.wso2.org/nexus/content/repositories/releases/org/wso2/carbon/kubernetes/artifacts/kubernetes-membership-scheme/${K8S_MEMBERSHIP_SCHEME_VERSION}/kubernetes-membership-scheme-${K8S_MEMBERSHIP_SCHEME_VERSION}.jar ${WSO2_SERVER_HOME}/repository/components/dropins # set the user and work directory USER ${USER_ID}