Migrate the accountapp to Gradle and prepare for Docker-based deployment

References INFRA-11, INFRA-613
This commit is contained in:
R. Tyler Croy 2016-03-21 13:11:27 -07:00
parent 6382c41125
commit 056fe7d1bb
No known key found for this signature in database
GPG Key ID: 1426C7DC3F51E16F
13 changed files with 358 additions and 217 deletions

7
.gitignore vendored
View File

@ -3,5 +3,8 @@
*.iws
target
config.properties
bin/jetty-runner.jar
.idea
bin/jetty-runner*.jar
.idea
.gradle/
*.sw*
build/

57
Jenkinsfile vendored
View File

@ -1,40 +1,35 @@
#!groovy
def imageName = 'jenkinsciinfra/account-app'
/* Only keep the X most recent builds. */
properties([[$class: 'jenkins.model.BuildDiscarderProperty', strategy: [$class: 'LogRotator',
numToKeepStr: '50',
artifactNumToKeepStr: '20']]])
properties([[$class: 'jenkins.model.BuildDiscarderProperty',
strategy: [$class: 'LogRotator',
numToKeepStr: '50',
artifactNumToKeepStr: '20']]])
stage 'Build'
node('docker') {
checkout scm
withMavenEnv {
sh 'mvn clean package'
step([$class: 'ArtifactArchiver', artifacts: '**/target/*.war', fingerprint: true])
}
}
/* This code shame-lessly copied and pasted from some Jenkinsfile code abayer
wrote for the jenkinsci/jenkins project */
void withMavenEnv(List envVars = [], def body) {
// The names here are currently hardcoded for my test environment. This needs
// to be made more flexible.
// Using the "tool" Workflow call automatically installs those tools on the
// node.
String mvntool = tool name: "mvn3.3.3", type: 'hudson.tasks.Maven$MavenInstallation'
String jdktool = tool name: "jdk7_80", type: 'hudson.model.JDK'
// Set JAVA_HOME, MAVEN_HOME and special PATH variables for the tools we're
// using.
List mvnEnv = ["PATH+MVN=${mvntool}/bin", "PATH+JDK=${jdktool}/bin", "JAVA_HOME=${jdktool}", "MAVEN_HOME=${mvntool}"]
// Add any additional environment variables.
mvnEnv.addAll(envVars)
// Invoke the body closure we're passed within the environment we've created.
withEnv(mvnEnv) {
body.call()
docker.image('java:8').inside {
sh './gradlew --no-daemon --info war'
step([$class: 'ArtifactArchiver',
artifacts: 'build/libs/*.war',
fingerprint: true])
}
}
node('docker') {
stage 'Package'
unarchive mapping: ['build/' : 'build/']
sh 'git rev-parse HEAD > GIT_COMMIT'
shortCommit = readFile('GIT_COMMIT').take(6)
def imageTag = "build${shortCommit}"
echo "Creating the container ${imageName}:${imageTag}"
def whale = docker.build("${imageName}:${imageTag}")
stage 'Deploy'
echo "Shipping ${imageTag}"
whale.push()
}

View File

@ -1,22 +0,0 @@
IMAGENAME=jenkinsciinfra/account-app
TAG=$(shell date '+%Y%m%d_%H%M%S')
target/accountapp.war :
mvn install
bin/jetty-runner.jar :
wget -O bin/jetty-runner.jar 'http://search.maven.org/remotecontent?filepath=org/mortbay/jetty/jetty-runner/8.1.15.v20140411/jetty-runner-8.1.15.v20140411.jar'
image : target/accountapp.war bin/jetty-runner.jar
docker build -t ${IMAGENAME} .
run :
docker run -P --rm -i -t -v ${PWD}:/etc/accountapp ${IMAGENAME}
tag :
docker tag ${IMAGENAME} ${IMAGENAME}:${TAG}
push :
docker push ${IMAGENAME}

View File

@ -25,7 +25,7 @@ following:
Finally, run the application with Jetty, then access `http://localhost:8080/`:
mvn jetty:run
./gradlew jettyRun
(As you can see above, this connects your test instance to the actual LDAP
server, so the data you'll be seeing is real.

View File

@ -1,2 +0,0 @@
- better e-mail content
- super user mode

View File

@ -1,3 +1,8 @@
#!/bin/bash
#!/bin/sh
cd "$(dirname "$0")"
exec java -DCONFIG=/etc/accountapp/config.properties -jar jetty-runner.jar --port 8080 --path /account accountapp.war
exec java -DCONFIG=/etc/accountapp/config.properties -jar jetty-runner*.jar \
--port 8080 \
--path /account \
accountapp.war

63
build.gradle Normal file
View File

@ -0,0 +1,63 @@
apply plugin: 'java'
apply plugin: 'jetty'
apply plugin: 'maven'
apply plugin: 'war'
group = 'org.jenkins-ci'
description = 'User self-service account management app'
version = '2.5'
repositories {
jcenter()
maven { url 'https://repo.jenkins-ci.org/public' }
}
configurations {
/* Docker jars are additional components we should copy into the container
*/
dockerJars
}
dependencies {
compile 'javax.servlet:servlet-api:2.4'
compile 'org.glassfish:javax.json:[1.0.2,2.0)'
compile 'org.kohsuke:stopforumspam:[1.0,2.0)'
compile 'commons-codec:commons-codec:1.4'
compile 'org.kohsuke.stapler:stapler:[1.233,2.0)'
compile('org.kohsuke.stapler:stapler-jelly:[1.203,2.0)')
compile 'org.kohsuke.stapler:stapler-openid-server:[1.0,2.0)'
compile 'javax.mail:mail:[1.4,2.0)'
compile 'javax.activation:activation:1.1.1'
/* needed for the app skin */
compile 'org.jenkins-ci.backend:jenkins-ci.org-theme:1.0'
compile('org.jenkins-ci.backend:jira-ldap-syncer:1.0') {
exclude module: 'javamail'
}
testCompile 'junit:junit:[4.8.1,5.0)'
dockerJars 'org.mortbay.jetty:jetty-runner:[8.1.15,)'
}
jettyRun {
contextPath '/account'
httpPort 8081
}
task copyRunner(type: Copy) {
description 'Grab the jetty-runner to execute our war in the container'
destinationDir = file('bin')
/* Only grab the jetty-runner jar */
from configurations.dockerJars.files.find { it.name.matches ~/jetty-runner-(.*).jar/ }
}
war {
dependsOn check, copyRunner
}

View File

@ -1,7 +0,0 @@
#!/bin/bash -ex
# deploy to the production server
mvn clean package
scp target/accountapp.war accountapp@cucumber:~
ssh cucumber sudo /etc/init.d/accountapp stop
sleep 3
ssh cucumber sudo /etc/init.d/accountapp start

BIN
gradle/wrapper/gradle-wrapper.jar vendored Normal file

Binary file not shown.

View File

@ -0,0 +1,6 @@
#Mon Mar 21 10:06:27 PDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip

160
gradlew vendored Executable file
View File

@ -0,0 +1,160 @@
#!/usr/bin/env bash
##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn ( ) {
echo "$*"
}
die ( ) {
echo
echo "$*"
echo
exit 1
}
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
esac
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
function splitJvmOpts() {
JVM_OPTS=("$@")
}
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

90
gradlew.bat vendored Normal file
View File

@ -0,0 +1,90 @@
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
goto execute
:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega

150
pom.xml
View File

@ -1,150 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jenkins-ci</groupId>
<artifactId>accountapp</artifactId>
<packaging>war</packaging>
<version>1.0-SNAPSHOT</version>
<name>User self-service account management application</name>
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<!-- <scope>provided</scope> added as compile scope to make batch process work -->
</dependency>
<dependency>
<groupId>org.jenkins-ci.backend</groupId>
<artifactId>jenkins-ci.org-theme</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>org.kohsuke</groupId>
<artifactId>stopforumspam</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.4</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
<version>1.0.2</version>
</dependency>
<dependency>
<groupId>org.kohsuke.stapler</groupId>
<artifactId>stapler</artifactId>
<version>1.233</version>
</dependency>
<dependency>
<groupId>org.kohsuke.stapler</groupId>
<artifactId>stapler-jelly</artifactId>
<version>1.203</version>
<exclusions>
<exclusion>
<groupId>commons-jexl</groupId>
<artifactId>commons-jexl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.backend</groupId>
<artifactId>jira-ldap-syncer</artifactId>
<version>1.0</version>
<exclusions>
<exclusion>
<groupId>javamail</groupId>
<artifactId>javamail</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.kohsuke.stapler</groupId>
<artifactId>stapler-openid-server</artifactId>
<version>1.0</version>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.kohsuke.stapler</groupId>
<artifactId>maven-stapler-plugin</artifactId>
<version>1.16</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>6.1.24</version>
<configuration>
<contextPath>/account</contextPath>
<!-- use the test classpath for loading resources, since this takes priority -->
<testClassesDirectory>src/main/resources</testClassesDirectory>
<useTestClasspath>true</useTestClasspath>
<port>8081</port>
<systemProperties>
<systemProperty>
<!-- always reload views during debugging -->
<name>stapler.jelly.noCache</name>
<value>true</value>
</systemProperty>
<systemProperty>
<!-- show the stapler evaluation during execution -->
<name>stapler.trace</name>
<value>true</value>
</systemProperty>
<systemProperty>
<!-- always reload scripts during debugging -->
<name>hudson.script.noCache</name>
<value>true</value>
</systemProperty>
<systemProperty>
<!-- load view resources from the source directly, again for real time change -->
<name>stapler.resourcePath</name>
<value>../src/main/resources</value>
</systemProperty>
</systemProperties>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>
</project>