From 7b80dffad4cb6af66e2bbae27c3b99a904a0d884 Mon Sep 17 00:00:00 2001 From: Smithi Date: Sun, 28 Feb 2016 18:36:41 +0100 Subject: [PATCH 1/5] Adding MySQL Connector to Bamboo --- bamboo-server/bamboo-server.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bamboo-server/bamboo-server.sh b/bamboo-server/bamboo-server.sh index 53bd6f8..0d8ade3 100755 --- a/bamboo-server/bamboo-server.sh +++ b/bamboo-server/bamboo-server.sh @@ -19,6 +19,14 @@ else echo "-> Extracting to $BAMBOO_DIR ..." tar xzf /tmp/atlassian-bamboo.tar.gz -C /opt rm -f /tmp/atlassian-bamboo.tar.gz + + echo "Add MySQL" + MYSQL_CONNECTOR_VERSION="5.1.38" + wget http://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-$MYSQL_CONNECTOR_VERSION.tar.gz -O /tmp/mysql-connector.tar.gz + tar xzf /tmp/mysql-connector.tar.gz -C /tmp + mv /tmp/mysql-connector-java-$MYSQL_CONNECTOR_VERSION/mysql-connector-java-$MYSQL_CONNECTOR_VERSION-bin.jar /opt/atlassian-bamboo-5.1/lib/ + rm -Rf /tmp/* + echo "-> Installation completed" fi From 2845e1e1be90c1f5ee43ca1eac4309bfbc00d69c Mon Sep 17 00:00:00 2001 From: Smithi Date: Sun, 28 Feb 2016 18:36:52 +0100 Subject: [PATCH 2/5] Update bamboo-server.sh --- bamboo-server/bamboo-server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bamboo-server/bamboo-server.sh b/bamboo-server/bamboo-server.sh index 0d8ade3..038e43b 100755 --- a/bamboo-server/bamboo-server.sh +++ b/bamboo-server/bamboo-server.sh @@ -20,7 +20,7 @@ else tar xzf /tmp/atlassian-bamboo.tar.gz -C /opt rm -f /tmp/atlassian-bamboo.tar.gz - echo "Add MySQL" + echo "Add MySQL Connector" MYSQL_CONNECTOR_VERSION="5.1.38" wget http://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-$MYSQL_CONNECTOR_VERSION.tar.gz -O /tmp/mysql-connector.tar.gz tar xzf /tmp/mysql-connector.tar.gz -C /tmp From 5a281404edfcb7dff0a318b9efc3b93db45cda6c Mon Sep 17 00:00:00 2001 From: Smithi Date: Sun, 28 Feb 2016 19:12:43 +0100 Subject: [PATCH 3/5] Update bamboo-server.sh --- bamboo-server/bamboo-server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bamboo-server/bamboo-server.sh b/bamboo-server/bamboo-server.sh index 038e43b..afad124 100755 --- a/bamboo-server/bamboo-server.sh +++ b/bamboo-server/bamboo-server.sh @@ -24,7 +24,7 @@ else MYSQL_CONNECTOR_VERSION="5.1.38" wget http://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-$MYSQL_CONNECTOR_VERSION.tar.gz -O /tmp/mysql-connector.tar.gz tar xzf /tmp/mysql-connector.tar.gz -C /tmp - mv /tmp/mysql-connector-java-$MYSQL_CONNECTOR_VERSION/mysql-connector-java-$MYSQL_CONNECTOR_VERSION-bin.jar /opt/atlassian-bamboo-5.1/lib/ + mv /tmp/mysql-connector-java-$MYSQL_CONNECTOR_VERSION/mysql-connector-java-$MYSQL_CONNECTOR_VERSION-bin.jar $BAMBOO_DIR/lib/ rm -Rf /tmp/* echo "-> Installation completed" From d838313f0fd4266cae00a4efc9e32d5cc58f2002 Mon Sep 17 00:00:00 2001 From: Smithi Date: Sun, 28 Feb 2016 19:18:58 +0100 Subject: [PATCH 4/5] Update bamboo-server.sh Adding $BAMBOO_DIR to MySQL Connector Installer Checking for $MYSQL_CONNECTOR_VERSION Environment Variable and set default value if it doesn't exist. --- bamboo-server/bamboo-server.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bamboo-server/bamboo-server.sh b/bamboo-server/bamboo-server.sh index afad124..847d5c9 100755 --- a/bamboo-server/bamboo-server.sh +++ b/bamboo-server/bamboo-server.sh @@ -20,8 +20,14 @@ else tar xzf /tmp/atlassian-bamboo.tar.gz -C /opt rm -f /tmp/atlassian-bamboo.tar.gz + echo "Add MySQL Connector" - MYSQL_CONNECTOR_VERSION="5.1.38" + + if [ -z $MYSQL_CONNECTOR_VERSION ]; then + echo "MYSQL_CONNECTOR_VERSION not set. Setting to 5.1.38" + MYSQL_CONNECTOR_VERSION=5.1.38 + fi + wget http://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-$MYSQL_CONNECTOR_VERSION.tar.gz -O /tmp/mysql-connector.tar.gz tar xzf /tmp/mysql-connector.tar.gz -C /tmp mv /tmp/mysql-connector-java-$MYSQL_CONNECTOR_VERSION/mysql-connector-java-$MYSQL_CONNECTOR_VERSION-bin.jar $BAMBOO_DIR/lib/ From 4c912948dbde6c7479a6b39ab1dc89828786a0ba Mon Sep 17 00:00:00 2001 From: Smithi Date: Sun, 28 Feb 2016 20:13:11 +0100 Subject: [PATCH 5/5] Update Dockerfile --- bamboo-server/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bamboo-server/Dockerfile b/bamboo-server/Dockerfile index 9584d09..dba9e3c 100644 --- a/bamboo-server/Dockerfile +++ b/bamboo-server/Dockerfile @@ -9,7 +9,7 @@ MAINTAINER H. Wüthrich "hw@5px.ch" CMD ["/sbin/my_init"] # Environment -ENV BAMBOO_VERSION 5.7.2 +ENV BAMBOO_VERSION 5.10.1.1 ENV BAMBOO_HOME /home/bamboo # Expose web and agent ports @@ -24,8 +24,8 @@ RUN apt-get update && apt-get upgrade -y # 28.01.2015 # Install Java OpenJDK 7 and VCS tools RUN apt-get install -yq python-software-properties && add-apt-repository ppa:webupd8team/java -y && apt-get update -RUN echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections -RUN apt-get install -yq oracle-java7-installer git subversion +RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections +RUN apt-get install -yq oracle-java8-installer git subversion # Clean up APT when done. RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*