Skip to content

Commit

Permalink
Merge pull request #343 from DedunuKarunarathne/remove-mysql
Browse files Browse the repository at this point in the history 
Remove MySQL JDBC connector from docker images
  • Loading branch information
@DedunuKarunarathne
DedunuKarunarathne authored Mar 18, 2024
2 parents 068efeb + 6e281e9 commit 9f12f2f
Show file tree
Hide file tree
Showing 15 changed files with 15 additions and 69 deletions.
6 changes: 1 addition & 5 deletions dockerfiles/alpine/analytics/dashboard/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ RUN echo Verifying install ... \
&& echo Complete.

LABEL maintainer="WSO2 Docker Maintainers <[email protected]>" \
com.wso2.docker.source="https://github.com/wso2/docker-ei/releases/tag/v6.6.0.5"
com.wso2.docker.source="https://github.com/wso2/docker-ei/releases/tag/v6.6.0.6"

# set Docker image build arguments
# build arguments for user/group configurations
Expand All @@ -78,8 +78,6 @@ ARG WSO2_SERVER_PROFILE_OPTIMIZER_NUMBER=2
ARG WSO2_SERVER=${WSO2_SERVER_NAME}-${WSO2_SERVER_VERSION}
ARG WSO2_SERVER_HOME=${USER_HOME}/${WSO2_SERVER}
ARG WSO2_SERVER_DIST_URL=https://bintray.com/wso2/binaryGA/download_file?file_path=${WSO2_SERVER}.zip
# build arguments for external artifacts
ARG MYSQL_CONNECTOR_VERSION=5.1.47
# build argument for MOTD
ARG MOTD='printf "\n\
Welcome to WSO2 Docker Resources \n\
Expand Down Expand Up @@ -113,8 +111,6 @@ RUN \
&& unzip -d ${USER_HOME} ${WSO2_SERVER_HOME}_${WSO2_SERVER_PROFILE_NAME}.zip \
&& chown wso2carbon:wso2 -R ${WSO2_SERVER_HOME} \
&& rm -f ${WSO2_SERVER_HOME}_${WSO2_SERVER_PROFILE_NAME}.zip
# 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}/wso2/analytics/lib/

# set the user and work directory
USER ${USER_ID}
Expand Down
6 changes: 1 addition & 5 deletions dockerfiles/alpine/analytics/worker/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ RUN echo Verifying install ... \
&& echo Complete.

LABEL maintainer="WSO2 Docker Maintainers <[email protected]>" \
com.wso2.docker.source="https://github.com/wso2/docker-ei/releases/tag/v6.6.0.5"
com.wso2.docker.source="https://github.com/wso2/docker-ei/releases/tag/v6.6.0.6"

# set Docker image build arguments
# build arguments for user/group configurations
Expand All @@ -78,8 +78,6 @@ ARG WSO2_SERVER_PROFILE_OPTIMIZER_NUMBER=2
ARG WSO2_SERVER=${WSO2_SERVER_NAME}-${WSO2_SERVER_VERSION}
ARG WSO2_SERVER_HOME=${USER_HOME}/${WSO2_SERVER}
ARG WSO2_SERVER_DIST_URL=https://bintray.com/wso2/binaryGA/download_file?file_path=${WSO2_SERVER}.zip
# build arguments for external artifacts
ARG MYSQL_CONNECTOR_VERSION=5.1.47
# build argument for MOTD
ARG MOTD='printf "\n\
Welcome to WSO2 Docker Resources \n\
Expand Down Expand Up @@ -113,8 +111,6 @@ RUN \
&& unzip -d ${USER_HOME} ${WSO2_SERVER_HOME}_${WSO2_SERVER_PROFILE_NAME}.zip \
&& chown wso2carbon:wso2 -R ${WSO2_SERVER_HOME} \
&& rm -f ${WSO2_SERVER_HOME}_${WSO2_SERVER_PROFILE_NAME}.zip
# 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}/wso2/analytics/lib/

# set the user and work directory
USER ${USER_ID}
Expand Down
5 changes: 1 addition & 4 deletions dockerfiles/alpine/broker/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# set base Docker image to AdoptOpenJDK Alpine Docker image
FROM adoptopenjdk/openjdk11:jdk-11.0.5_10-alpine
LABEL maintainer="WSO2 Docker Maintainers <[email protected]>" \
com.wso2.docker.source="https://github.com/wso2/docker-ei/releases/tag/v6.6.0.4"
com.wso2.docker.source="https://github.com/wso2/docker-ei/releases/tag/v6.6.0.6"

# set Docker image build arguments
# build arguments for user/group configurations
Expand All @@ -39,7 +39,6 @@ ARG WSO2_SERVER_DIST_URL=https://bintray.com/wso2/binaryGA/download_file?file_pa
# build arguments for external artifacts
ARG DNS_JAVA_VERSION=2.1.8
ARG K8S_MEMBERSHIP_SCHEME_VERSION=1.0.7
ARG MYSQL_CONNECTOR_VERSION=5.1.47
# build argument for MOTD
ARG MOTD='printf "\n\
Welcome to WSO2 Docker Resources \n\
Expand Down Expand Up @@ -76,8 +75,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}/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}/lib
# 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}/dropins/

# set the user and work directory
USER ${USER_ID}
Expand Down
6 changes: 1 addition & 5 deletions dockerfiles/alpine/business-process/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# set base Docker image to AdoptOpenJDK Alpine Docker image
FROM adoptopenjdk/openjdk11:jdk-11.0.5_10-alpine
LABEL maintainer="WSO2 Docker Maintainers <[email protected]>" \
com.wso2.docker.source="https://github.com/wso2/docker-ei/releases/tag/v6.6.0.4"
com.wso2.docker.source="https://github.com/wso2/docker-ei/releases/tag/v6.6.0.6"

# set Docker image build arguments
# build arguments for user/group configurations
Expand All @@ -36,8 +36,6 @@ ARG WSO2_SERVER_PROFILE_OPTIMIZER_NUMBER=3
ARG WSO2_SERVER=${WSO2_SERVER_NAME}-${WSO2_SERVER_VERSION}
ARG WSO2_SERVER_HOME=${USER_HOME}/${WSO2_SERVER}
ARG WSO2_SERVER_DIST_URL=https://bintray.com/wso2/binaryGA/download_file?file_path=${WSO2_SERVER}.zip
# build arguments for external artifacts
ARG MYSQL_CONNECTOR_VERSION=5.1.47
# build argument for MOTD
ARG MOTD='printf "\n\
Welcome to WSO2 Docker Resources \n\
Expand Down Expand Up @@ -71,8 +69,6 @@ RUN \
&& unzip -d ${USER_HOME} ${WSO2_SERVER_HOME}_${WSO2_SERVER_PROFILE_NAME}.zip \
&& chown wso2carbon:wso2 -R ${WSO2_SERVER_HOME} \
&& rm -f ${WSO2_SERVER_HOME}_${WSO2_SERVER_PROFILE_NAME}.zip
# 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}/dropins/

# set the user and work directory
USER ${USER_ID}
Expand Down
5 changes: 1 addition & 4 deletions dockerfiles/alpine/integrator/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ RUN echo Verifying install ... \
&& echo Complete.

LABEL maintainer="WSO2 Docker Maintainers <[email protected]>" \
com.wso2.docker.source="https://github.com/wso2/docker-ei/releases/tag/v6.6.0.5"
com.wso2.docker.source="https://github.com/wso2/docker-ei/releases/tag/v6.6.0.6"

# set Docker image build arguments
# build arguments for user/group configurations
Expand All @@ -81,7 +81,6 @@ ARG WSO2_SERVER_DIST_URL=https://bintray.com/wso2/binaryGA/download_file?file_pa
# build arguments for external artifacts
ARG DNS_JAVA_VERSION=2.1.8
ARG K8S_MEMBERSHIP_SCHEME_VERSION=1.0.7
ARG MYSQL_CONNECTOR_VERSION=5.1.47
# build argument for MOTD
ARG MOTD='printf "\n\
Welcome to WSO2 Docker Resources \n\
Expand Down Expand Up @@ -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}/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}/lib
# 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}/dropins/

# set the user and work directory
USER ${USER_ID}
Expand Down
6 changes: 1 addition & 5 deletions dockerfiles/centos/analytics/dashboard/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# set base Docker image to latest CentOS Docker image
FROM centos:7
LABEL maintainer="WSO2 Docker Maintainers <[email protected]>" \
com.wso2.docker.source="https://github.com/wso2/docker-ei/releases/tag/v6.6.0.5"
com.wso2.docker.source="https://github.com/wso2/docker-ei/releases/tag/v6.6.0.6"

# set Docker image build arguments
# build arguments for user/group configurations
Expand All @@ -36,8 +36,6 @@ ARG WSO2_SERVER_PROFILE_OPTIMIZER_NUMBER=2
ARG WSO2_SERVER=${WSO2_SERVER_NAME}-${WSO2_SERVER_VERSION}
ARG WSO2_SERVER_HOME=${USER_HOME}/${WSO2_SERVER}
ARG WSO2_SERVER_DIST_URL=https://bintray.com/wso2/binaryGA/download_file?file_path=${WSO2_SERVER}.zip
# build arguments for external artifacts
ARG MYSQL_CONNECTOR_VERSION=5.1.47
# build argument for MOTD
ARG MOTD='printf "\n\
Welcome to WSO2 Docker resources.\n\
Expand Down Expand Up @@ -117,8 +115,6 @@ RUN \
&& unzip -d ${USER_HOME} ${WSO2_SERVER_HOME}_${WSO2_SERVER_PROFILE_NAME}.zip \
&& chown wso2carbon:wso2 -R ${WSO2_SERVER_HOME} \
&& rm -f ${WSO2_SERVER_HOME}_${WSO2_SERVER_PROFILE_NAME}.zip
# 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}/wso2/analytics/lib/

# set the user and work directory
USER ${USER_ID}
Expand Down
6 changes: 1 addition & 5 deletions dockerfiles/centos/analytics/worker/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# set base Docker image to latest CentOS Docker image
FROM centos:7
LABEL maintainer="WSO2 Docker Maintainers <[email protected]>" \
com.wso2.docker.source="https://github.com/wso2/docker-ei/releases/tag/v6.6.0.5"
com.wso2.docker.source="https://github.com/wso2/docker-ei/releases/tag/v6.6.0.6"

# set Docker image build arguments
# build arguments for user/group configurations
Expand All @@ -36,8 +36,6 @@ ARG WSO2_SERVER_PROFILE_OPTIMIZER_NUMBER=2
ARG WSO2_SERVER=${WSO2_SERVER_NAME}-${WSO2_SERVER_VERSION}
ARG WSO2_SERVER_HOME=${USER_HOME}/${WSO2_SERVER}
ARG WSO2_SERVER_DIST_URL=https://bintray.com/wso2/binaryGA/download_file?file_path=${WSO2_SERVER}.zip
# build arguments for external artifacts
ARG MYSQL_CONNECTOR_VERSION=5.1.47
# build argument for MOTD
ARG MOTD='printf "\n\
Welcome to WSO2 Docker resources.\n\
Expand Down Expand Up @@ -117,8 +115,6 @@ RUN \
&& unzip -d ${USER_HOME} ${WSO2_SERVER_HOME}_${WSO2_SERVER_PROFILE_NAME}.zip \
&& chown wso2carbon:wso2 -R ${WSO2_SERVER_HOME} \
&& rm -f ${WSO2_SERVER_HOME}_${WSO2_SERVER_PROFILE_NAME}.zip
# 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}/wso2/analytics/lib/

# set the user and work directory
USER ${USER_ID}
Expand Down
5 changes: 1 addition & 4 deletions dockerfiles/centos/broker/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# set base Docker image to latest CentOS Docker image
FROM centos:7
LABEL maintainer="WSO2 Docker Maintainers <[email protected]>" \
com.wso2.docker.source="https://github.com/wso2/docker-ei/releases/tag/v6.6.0.4"
com.wso2.docker.source="https://github.com/wso2/docker-ei/releases/tag/v6.6.0.6"

# set Docker image build arguments
# build arguments for user/group configurations
Expand All @@ -41,7 +41,6 @@ ARG WSO2_SERVER_DIST_URL=https://bintray.com/wso2/binaryGA/download_file?file_pa
# build arguments for external artifacts
ARG DNS_JAVA_VERSION=2.1.8
ARG K8S_MEMBERSHIP_SCHEME_VERSION=1.0.7
ARG MYSQL_CONNECTOR_VERSION=5.1.47
# build argument for MOTD
ARG MOTD='printf "\n\
Welcome to WSO2 Docker resources.\n\
Expand Down Expand Up @@ -88,8 +87,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}/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}/lib
# 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}/dropins/

# set the user and work directory
USER ${USER_ID}
Expand Down
6 changes: 1 addition & 5 deletions dockerfiles/centos/business-process/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# set base Docker image to latest CentOS Docker image
FROM centos:7
LABEL maintainer="WSO2 Docker Maintainers <[email protected]>" \
com.wso2.docker.source="https://github.com/wso2/docker-ei/releases/tag/v6.6.0.4"
com.wso2.docker.source="https://github.com/wso2/docker-ei/releases/tag/v6.6.0.6"

# set Docker image build arguments
# build arguments for user/group configurations
Expand All @@ -38,8 +38,6 @@ ARG WSO2_SERVER_PROFILE_OPTIMIZER_NUMBER=3
ARG WSO2_SERVER=${WSO2_SERVER_NAME}-${WSO2_SERVER_VERSION}
ARG WSO2_SERVER_HOME=${USER_HOME}/${WSO2_SERVER}
ARG WSO2_SERVER_DIST_URL=https://bintray.com/wso2/binaryGA/download_file?file_path=${WSO2_SERVER}.zip
# build arguments for external artifacts
ARG MYSQL_CONNECTOR_VERSION=5.1.47
# build argument for MOTD
ARG MOTD='printf "\n\
Welcome to WSO2 Docker resources.\n\
Expand Down Expand Up @@ -83,8 +81,6 @@ RUN \
&& unzip -d ${USER_HOME} ${WSO2_SERVER_HOME}_${WSO2_SERVER_PROFILE_NAME}.zip \
&& chown wso2carbon:wso2 -R ${WSO2_SERVER_HOME} \
&& rm -f ${WSO2_SERVER_HOME}_${WSO2_SERVER_PROFILE_NAME}.zip
# 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}/dropins/

# set the user and work directory
USER ${USER_ID}
Expand Down
5 changes: 1 addition & 4 deletions dockerfiles/centos/integrator/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# set base Docker image to latest CentOS Docker image
FROM centos:7
LABEL maintainer="WSO2 Docker Maintainers <[email protected]>" \
com.wso2.docker.source="https://github.com/wso2/docker-ei/releases/tag/v6.6.0.5"
com.wso2.docker.source="https://github.com/wso2/docker-ei/releases/tag/v6.6.0.6"

# set Docker image build arguments
# build arguments for user/group configurations
Expand All @@ -41,7 +41,6 @@ ARG WSO2_SERVER_DIST_URL=https://bintray.com/wso2/binaryGA/download_file?file_pa
# build arguments for external artifacts
ARG DNS_JAVA_VERSION=2.1.8
ARG K8S_MEMBERSHIP_SCHEME_VERSION=1.0.7
ARG MYSQL_CONNECTOR_VERSION=5.1.47
# build argument for MOTD
ARG MOTD='printf "\n\
Welcome to WSO2 Docker resources.\n\
Expand Down Expand Up @@ -125,8 +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}/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}/lib
# 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}/dropins/

# set the user and work directory
USER ${USER_ID}
Expand Down
6 changes: 1 addition & 5 deletions dockerfiles/ubuntu/analytics/dashboard/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ RUN echo Verifying install ... \
&& echo Complete.

LABEL maintainer="WSO2 Docker Maintainers <[email protected]>" \
com.wso2.docker.source="https://github.com/wso2/docker-ei/releases/tag/v6.6.0.5"
com.wso2.docker.source="https://github.com/wso2/docker-ei/releases/tag/v6.6.0.6"

# set Docker image build arguments
# build arguments for user/group configurations
Expand All @@ -93,8 +93,6 @@ ARG WSO2_SERVER_PROFILE_OPTIMIZER_NUMBER=2
ARG WSO2_SERVER=${WSO2_SERVER_NAME}-${WSO2_SERVER_VERSION}
ARG WSO2_SERVER_HOME=${USER_HOME}/${WSO2_SERVER}
ARG WSO2_SERVER_DIST_URL=https://bintray.com/wso2/binaryGA/download_file?file_path=${WSO2_SERVER}.zip
# build arguments for external artifacts
ARG MYSQL_CONNECTOR_VERSION=5.1.47
# build argument for MOTD
ARG MOTD="\n\
Welcome to WSO2 Docker resources.\n\
Expand Down Expand Up @@ -130,8 +128,6 @@ RUN \
&& unzip -d ${USER_HOME} ${WSO2_SERVER_HOME}_${WSO2_SERVER_PROFILE_NAME}.zip \
&& chown wso2carbon:wso2 -R ${WSO2_SERVER_HOME} \
&& rm -f ${WSO2_SERVER_HOME}_${WSO2_SERVER_PROFILE_NAME}.zip
# 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}/wso2/analytics/lib/

# set the user and work directory
USER ${USER_ID}
Expand Down
6 changes: 1 addition & 5 deletions dockerfiles/ubuntu/analytics/worker/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ RUN echo Verifying install ... \
&& echo Complete.

LABEL maintainer="WSO2 Docker Maintainers <[email protected]>" \
com.wso2.docker.source="https://github.com/wso2/docker-ei/releases/tag/v6.6.0.5"
com.wso2.docker.source="https://github.com/wso2/docker-ei/releases/tag/v6.6.0.6"

# set Docker image build arguments
# build arguments for user/group configurations
Expand All @@ -93,8 +93,6 @@ ARG WSO2_SERVER_PROFILE_OPTIMIZER_NUMBER=2
ARG WSO2_SERVER=${WSO2_SERVER_NAME}-${WSO2_SERVER_VERSION}
ARG WSO2_SERVER_HOME=${USER_HOME}/${WSO2_SERVER}
ARG WSO2_SERVER_DIST_URL=https://bintray.com/wso2/binaryGA/download_file?file_path=${WSO2_SERVER}.zip
# build arguments for external artifacts
ARG MYSQL_CONNECTOR_VERSION=5.1.47
# build argument for MOTD
ARG MOTD="\n\
Welcome to WSO2 Docker resources.\n\
Expand Down Expand Up @@ -130,8 +128,6 @@ RUN \
&& unzip -d ${USER_HOME} ${WSO2_SERVER_HOME}_${WSO2_SERVER_PROFILE_NAME}.zip \
&& chown wso2carbon:wso2 -R ${WSO2_SERVER_HOME} \
&& rm -f ${WSO2_SERVER_HOME}_${WSO2_SERVER_PROFILE_NAME}.zip
# 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}/wso2/analytics/lib/

# set the user and work directory
USER ${USER_ID}
Expand Down
5 changes: 1 addition & 4 deletions dockerfiles/ubuntu/broker/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# set base Docker image to AdoptOpenJDK Ubuntu Docker image
FROM adoptopenjdk:11.0.5_10-jdk-hotspot-bionic
LABEL maintainer="WSO2 Docker Maintainers <[email protected]>" \
com.wso2.docker.source="https://github.com/wso2/docker-ei/releases/tag/v6.6.0.4"
com.wso2.docker.source="https://github.com/wso2/docker-ei/releases/tag/v6.6.0.6"

# set Docker image build arguments
# build arguments for user/group configurations
Expand All @@ -39,7 +39,6 @@ ARG WSO2_SERVER_DIST_URL=https://bintray.com/wso2/binaryGA/download_file?file_pa
# build arguments for external artifacts
ARG DNS_JAVA_VERSION=2.1.8
ARG K8S_MEMBERSHIP_SCHEME_VERSION=1.0.7
ARG MYSQL_CONNECTOR_VERSION=5.1.47
# build argument for MOTD
ARG MOTD="\n\
Welcome to WSO2 Docker resources.\n\
Expand Down Expand Up @@ -78,8 +77,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}/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}/lib
# 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}/dropins/

# set the user and work directory
USER ${USER_ID}
Expand Down
Loading

0 comments on commit 9f12f2f

Please sign in to comment.