From 2753a2273dd242670f016a9e7eb284ded35e23b9 Mon Sep 17 00:00:00 2001 From: ZiyamSanthosh Date: Mon, 17 Jun 2024 14:01:20 +0530 Subject: [PATCH] Remove third party JDBC connector from base docker image --- README.md | 4 ++-- dockerfiles/alpine/is/Dockerfile | 5 +---- dockerfiles/centos/is/Dockerfile | 5 +---- dockerfiles/ubuntu/is/Dockerfile | 5 +---- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index b8dabdb3..06980f9b 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ This repository contains following Docker resources: Per profile Docker resources for WSO2 Identity Server help you build generic Docker images for deploying the corresponding product servers in containerized environments. Each Docker image includes the JDK, the relevant product distribution -and a collection of utility libraries. Configurations, custom JDBC drivers other than the default MySQL JDBC driver provided, -extensions and other deployable artifacts are designed to be provided via volume mounts to the containers spawned. +and a collection of utility libraries. Configurations, custom JDBC drivers, extensions and other deployable artifacts +are designed to be provided via volume mounts to the containers spawned. Docker Compose resources have been created according to the most common IAM deployment patterns available for allowing users to quickly evaluate product features along side their co-operate IAM requirements. The Compose files make use of per profile diff --git a/dockerfiles/alpine/is/Dockerfile b/dockerfiles/alpine/is/Dockerfile index 87d6d3bd..4bed6d78 100755 --- a/dockerfiles/alpine/is/Dockerfile +++ b/dockerfiles/alpine/is/Dockerfile @@ -1,6 +1,6 @@ # ------------------------------------------------------------------------ # -# Copyright 2021 WSO2, LLC. (http://wso2.com) +# Copyright 2024 WSO2, LLC. (http://wso2.com) # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -75,7 +75,6 @@ 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 -ARG MYSQL_CONNECTOR_VERSION=8.0.29 # build argument for MOTD ARG MOTD='printf "\n\ Welcome to WSO2 Docker Resources \n\ @@ -117,8 +116,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 -# add MySQL JDBC connector to server home as a third party library -ADD --chown=wso2carbon:wso2 https://repo1.maven.org/maven2/mysql/mysql-connector-java/${MYSQL_CONNECTOR_VERSION}/mysql-connector-java-${MYSQL_CONNECTOR_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 4e9c3a60..0431cb2b 100755 --- a/dockerfiles/centos/is/Dockerfile +++ b/dockerfiles/centos/is/Dockerfile @@ -1,6 +1,6 @@ # ------------------------------------------------------------------------ # -# Copyright 2022 WSO2, LLC. (http://wso2.com) +# Copyright 2024 WSO2, LLC. (http://wso2.com) # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -70,7 +70,6 @@ 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 -ARG MYSQL_CONNECTOR_VERSION=8.0.29 # build argument for MOTD ARG MOTD='printf "\n\ Welcome to WSO2 Docker resources.\n\ @@ -113,8 +112,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 -# add MySQL JDBC connector to server home as a third party library -ADD --chown=wso2carbon:wso2 https://repo1.maven.org/maven2/mysql/mysql-connector-java/${MYSQL_CONNECTOR_VERSION}/mysql-connector-java-${MYSQL_CONNECTOR_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 a7bbaae4..d8456712 100755 --- a/dockerfiles/ubuntu/is/Dockerfile +++ b/dockerfiles/ubuntu/is/Dockerfile @@ -1,6 +1,6 @@ # ------------------------------------------------------------------------ # -# Copyright 2021 WSO2, LLC. (http://wso2.com) +# Copyright 2024 WSO2, LLC. (http://wso2.com) # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -74,7 +74,6 @@ 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 -ARG MYSQL_CONNECTOR_VERSION=8.0.29 # build argument for MOTD ARG MOTD="\n\ Welcome to WSO2 Docker resources.\n\ @@ -118,8 +117,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 -# add MySQL JDBC connector to server home as a third party library -ADD --chown=wso2carbon:wso2 https://repo1.maven.org/maven2/mysql/mysql-connector-java/${MYSQL_CONNECTOR_VERSION}/mysql-connector-java-${MYSQL_CONNECTOR_VERSION}.jar ${WSO2_SERVER_HOME}/repository/components/dropins/ # set the user and work directory USER ${USER_ID}