Docker

Author: tomasbjerre

.travis.yml

@@ -2,22 +2,15 @@ sudo: false
 language: java
 jdk:
   - oraclejdk8
+
 before_install:
-  - wget https://marketplace.atlassian.com/download/plugins/atlassian-plugin-sdk-tgz
-  - mkdir opt
-  - tar -xvzf *plugin-sdk* -C opt
-  - mv opt/*plugin-sdk* opt/atlassian-plugin-sdk
-  - chmod a+x opt/atlassian-plugin-sdk/bin/*
-  - chmod a+x opt/atlassian-plugin-sdk/apache-maven-*/bin/*
+  - ./setup-atlassian-sdk.sh
   - export PATH=opt/atlassian-plugin-sdk/bin:opt/atlassian-plugin-sdk/apache-maven-*/bin:$PATH
-  - atlas-version
 install:
-  #Install Atlassian libs in local Maven repo
   - atlas-mvn -q install -Dstash.version=4.0.0
   - atlas-mvn -q install
 script:
   - atlas-package -q -Dstash.version=4.0.0
   - atlas-package -q
-#  - ./integration-test.sh
 notifications:
   email: false

CHANGELOG.md

@@ -3,12 +3,18 @@
 Changelog of Pull Request Notifier for Bitbucket.
 
 ## Unreleased
-### GitHub [#117](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/issues/117) PULL_REQUEST_TO_HASH
+### No issue
+  Docker
+  
+  [85abd1f93c4bae7](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/85abd1f93c4bae7) Tomas Bjerre *2016-05-15 07:01:56*
+
+## 2.21
+### GitHub [#117](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/issues/117) PULL_REQUEST_TO_HASH resolved to old commit
   Adding missing consumes annotation on REST resources 
 
  * Adding integration test for REST API.
 
-  [e8f7cc71c9a97d3](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/e8f7cc71c9a97d3) Tomas Bjerre *2016-05-14 22:04:19*
+  [843a1d6cb7cc3d6](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/843a1d6cb7cc3d6) Tomas Bjerre *2016-05-14 22:04:48*
 
 ### No issue
   Avoiding looking for legacy settings if no such keys

Dockerfile

@@ -0,0 +1,17 @@
+FROM java:8-jdk
+
+EXPOSE 7990
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+ADD src /usr/src/app/src
+ADD README.md /usr/src/app
+ADD pom.xml /usr/src/app
+ADD setup-atlassian-sdk.sh /usr/src/app
+
+RUN ./setup-atlassian-sdk.sh
+ENV PATH opt/atlassian-plugin-sdk/bin:opt/atlassian-plugin-sdk/apache-maven-*/bin:$PATH
+RUN atlas-version
+
+ENTRYPOINT exec atlas-run

README.md

@@ -153,6 +153,14 @@ If you are using a CSRF protection in Jenkins, you can use the **Injection URL**
 * In the headers section, set header **.crumb** with value **${INJECTION_URL_VALUE}**.
 
 ## Developer instructions
+There are some scripts to help working with the plugin.
+
+ * `./setup-atlassian-sdk.sh` Setup Atlassian SDK.
+ * `./docker-build.sh` Build Docker container.
+ * `./docker-run.sh` Run the Docker container.
+ * `./integration-test-local.sh` Run integration tests against localhost.
+ * `./integration-test.sh` Start Docker container and then runs integration tests against it.
+
 The .travis.yml is setting up Atlas SDK and building the plugin. It may help you setup your environment.
 
 Prerequisites:
@@ -173,7 +181,7 @@ atlas-package
 Run Bitbucket, with the plugin, on localhost:
 ```
 export MAVEN_OPTS=-Dplugin.resource.directories=`pwd`/src/main/resources
-mvn bitbucket:run
+atlas-run
 ```
 
 You can also remote debug on port 5005 with:

docker-build.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build -t prnfb .

docker-clean.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+# Delete all containers
+docker rm $(docker ps -a -q)
+# Delete all images
+docker rmi $(docker images -q)

docker-run.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker run --name prnfb -d prnfb

integration-test-local.sh

@@ -2,4 +2,4 @@
 #
 # Assuming you have the plugin running locally. You can start it with atlas-run.
 #
-atlas-mvn test -P integration-test
+atlas-mvn -q test -P integration-test

integration-test.sh

@@ -9,7 +9,7 @@ function build_clean {
   echo "Bitbucket Server is running at $KILLPID, killing it"
   kill $KILLPID || echo;
  done
- atlas-mvn clean
+ atlas-mvn -q clean
 }
 
 function on_exit {
@@ -21,7 +21,8 @@ build_clean
 #
 # Start Bitbucket Server
 #
-atlas-run -q  || exit 1 &
+./docker-build.sh
+./docker-run.sh  || exit 1 &
 
 BITBUCKET_URL=http://localhost:7990/bitbucket
 until $(curl --output /dev/null --silent --head --fail $BITBUCKET_URL); do

setup-atlassian-sdk.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+wget https://marketplace.atlassian.com/download/plugins/atlassian-plugin-sdk-tgz
+mkdir opt
+tar -xvzf *plugin-sdk* -C opt
+mv opt/*plugin-sdk* opt/atlassian-plugin-sdk
+chmod a+x opt/atlassian-plugin-sdk/bin/*
+chmod a+x opt/atlassian-plugin-sdk/apache-maven-*/bin/*
+echo "export PATH=opt/atlassian-plugin-sdk/bin:opt/atlassian-plugin-sdk/apache-maven-*/bin:$PATH" >> ~/.bashrc
+source ~/.bashrc