From b92e3a92f5aaa22c8337253d1175682101184863 Mon Sep 17 00:00:00 2001 From: Dino Korah Date: Fri, 5 Feb 2016 04:31:39 +0000 Subject: [PATCH] Exposes a local dir as BAMBOO_HOME --- .gitignore | 5 +++-- data/.placeholder | 0 docker-compose.yml | 7 ++++--- {mysql/initdb => mysql-initdb}/init.sh | 0 server-data/Dockerfile | 4 +++- 5 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 data/.placeholder rename {mysql/initdb => mysql-initdb}/init.sh (100%) diff --git a/.gitignore b/.gitignore index c1486b1..6900821 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ -/mysql/data +/data/mysql +/data/bamboo /server/atlassian-bamboo-*.tar.gz -/.idea \ No newline at end of file +/.idea diff --git a/data/.placeholder b/data/.placeholder new file mode 100644 index 0000000..e69de29 diff --git a/docker-compose.yml b/docker-compose.yml index 3c6608b..f3ea5e0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,10 +21,11 @@ mysql: bamboo-server-data: build: server-data + volumes: + - ./data/bamboo:/var/atlassian/application-data/bamboo mysql-data: image: debian:jessie volumes: - - ./mysql/data:/var/lib/mysql - - ./mysql/initdb:/docker-entrypoint-initdb.d - entrypoint: /bin/bash + - ./data/mysql:/var/lib/mysql + - ./mysql-initdb:/docker-entrypoint-initdb.d diff --git a/mysql/initdb/init.sh b/mysql-initdb/init.sh similarity index 100% rename from mysql/initdb/init.sh rename to mysql-initdb/init.sh diff --git a/server-data/Dockerfile b/server-data/Dockerfile index 5e143bb..e58c374 100644 --- a/server-data/Dockerfile +++ b/server-data/Dockerfile @@ -3,7 +3,7 @@ FROM debian:jessie MAINTAINER Dino.Korah@redmatter.com ENV TZ="Europe/London" \ - BAMBOO_HOME="/var/atlassian/application-data/bamboo" + BAMBOO_HOME="/var/atlassian/application-data/bamboo" \ # unprivileged users used to run the app RUN_USER=daemon \ RUN_GROUP=daemon @@ -15,3 +15,5 @@ RUN \ VOLUME ["${BAMBOO_HOME}"] +CMD chown ${RUN_USER}:${RUN_GROUP} ${BAMBOO_HOME} +