Skip to content

Commit 925f3a5

Browse files
authored
Merge pull request #8 from companieshouse/skeleton-app-setup
add tiltfile for docker
2 parents 767ff48 + 61cb7fb commit 925f3a5

File tree

4 files changed

+53
-0
lines changed

4 files changed

+53
-0
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ endif
3434
mvn versions:set -DnewVersion=$(version) -DgenerateBackupPoms=false
3535
mvn package -DskipTests=true
3636
$(eval tmpdir:=$(shell mktemp -d build-XXXXXXXXXX))
37+
cp ./start.sh $(tmpdir)
3738
cp ./target/$(artifact_name)-$(version).jar $(tmpdir)/$(artifact_name).jar
3839
cd $(tmpdir); zip -r ../$(artifact_name)-$(version).zip *
3940
rm -rf $(tmpdir)

Tiltfile.dev

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
local_resource(
2+
name = 'dev:psc-data-api-build',
3+
cmd = 'mvn compile',
4+
deps = ['src']
5+
)
6+
7+
custom_build(
8+
ref = '169942020521.dkr.ecr.eu-west-1.amazonaws.com/local/psc-data-api',
9+
command = 'mvn compile jib:dockerBuild -Dimage=$EXPECTED_REF',
10+
live_update = [
11+
sync(
12+
local_path = './target/classes',
13+
remote_path = '/app/classes'
14+
),
15+
restart_container()
16+
],
17+
deps = ['./target/classes']
18+
)

pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@
2222
<maven.compiler.target>${java.version}</maven.compiler.target>
2323
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
2424
<jib-maven-plugin.version>3.1.1</jib-maven-plugin.version>
25+
26+
<!--sonar configuration-->
27+
<sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/target/site/jacoco/jacoco.xml,
28+
${project.basedir}/target/site/jacoco-it/jacoco.xml
29+
</sonar.coverage.jacoco.xmlReportPaths>
30+
<sonar.jacoco.reports>${project.basedir}/target/site</sonar.jacoco.reports>
2531
</properties>
2632
<dependencyManagement>
2733
<dependencies>

start.sh

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#!/bin/bash
2+
#
3+
# Start script for psc-data-api
4+
5+
APP_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
6+
7+
if [[ -z "${MESOS_SLAVE_PID}" ]]; then
8+
source ~/.chs_env/private_env
9+
source ~/.chs_env/global_env
10+
source ~/.chs_env/psc-data-api/env
11+
12+
PORT="${PSC_DATA_API_PORT}"
13+
else
14+
PORT="$1"
15+
CONFIG_URL="$2"
16+
ENVIRONMENT="$3"
17+
APP_NAME="$4"
18+
19+
echo "Downloading environment from: ${CONFIG_URL}/${ENVIRONMENT}/${APP_NAME}"
20+
wget -O "${APP_DIR}/private_env" "${CONFIG_URL}/${ENVIRONMENT}/private_env"
21+
wget -O "${APP_DIR}/global_env" "${CONFIG_URL}/${ENVIRONMENT}/global_env"
22+
wget -O "${APP_DIR}/app_env" "${CONFIG_URL}/${ENVIRONMENT}/${APP_NAME}/env"
23+
source "${APP_DIR}/private_env"
24+
source "${APP_DIR}/global_env"
25+
source "${APP_DIR}/app_env"
26+
fi
27+
28+
exec java ${JAVA_MEM_ARGS} -jar -Dserver.port="${PORT}" "${APP_DIR}/psc-data-api.jar"

0 commit comments

Comments
 (0)