From 211e211ba4d7e246f94fe02bc746623b122b3d1e Mon Sep 17 00:00:00 2001 From: dale Date: Wed, 11 Sep 2019 09:38:13 +0000 Subject: [PATCH 1/6] Testing 1st commit --- microtrader-portfolio/src/main/asciidoc/dataobjects.adoc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/microtrader-portfolio/src/main/asciidoc/dataobjects.adoc b/microtrader-portfolio/src/main/asciidoc/dataobjects.adoc index 1300228..edde131 100644 --- a/microtrader-portfolio/src/main/asciidoc/dataobjects.adoc +++ b/microtrader-portfolio/src/main/asciidoc/dataobjects.adoc @@ -8,16 +8,14 @@ ++++ ''' -[cols=">25%,^25%,50%"] +[cols=">25%,25%,50%"] [frame="topbot"] |=== ^|Name | Type ^| Description -|[[cash]]`cash`|`Number (double)`| -+++ +|[[cash]]`@cash`|`Number (double)`|+++ Sets the available cash. Method used by the converter. +++ -|[[shares]]`shares`|`Number (Integer)`| -+++ +|[[shares]]`@shares`|`Number (Integer)`|+++ Sets the owned shares. Method used by the converter. +++ |=== From 1dce417ec2826cc1d843fae75a5f502f58db5263 Mon Sep 17 00:00:00 2001 From: daleellwood <49533802+daleellwood@users.noreply.github.com> Date: Wed, 18 Sep 2019 11:48:22 +0200 Subject: [PATCH 2/6] Update Dockerfile.audit --- docker/release/Dockerfile.audit | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/release/Dockerfile.audit b/docker/release/Dockerfile.audit index a9b1eb8..1a87c5a 100644 --- a/docker/release/Dockerfile.audit +++ b/docker/release/Dockerfile.audit @@ -1,4 +1,4 @@ -FROM dockerproductionaws/microtrader-base +FROM 233522827226.dkr.ecr.eu-west-2.amazonaws.com/dockerproductionaws/microtrader-base MAINTAINER Justin Menga LABEL application.component=microtrader-audit HEALTHCHECK --interval=3s --retries=20 CMD curl -fs http://localhost:${HTTP_PORT:-33000}/${HTTP_ROOT} @@ -6,4 +6,4 @@ HEALTHCHECK --interval=3s --retries=20 CMD curl -fs http://localhost:${HTTP_PORT # Copy application artefacts ARG app_version LABEL application.version=${app_version} -COPY build/jars/microtrader-audit-${app_version}-fat.jar /app/app.jar \ No newline at end of file +COPY build/jars/microtrader-audit-${app_version}-fat.jar /app/app.jar From f6c66d483eef3b6c5a228b7770cf40d119c43a98 Mon Sep 17 00:00:00 2001 From: daleellwood <49533802+daleellwood@users.noreply.github.com> Date: Wed, 18 Sep 2019 11:49:07 +0200 Subject: [PATCH 3/6] Update Dockerfile.dashboard --- docker/release/Dockerfile.dashboard | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/release/Dockerfile.dashboard b/docker/release/Dockerfile.dashboard index db7ade6..333a29e 100644 --- a/docker/release/Dockerfile.dashboard +++ b/docker/release/Dockerfile.dashboard @@ -1,4 +1,4 @@ -FROM dockerproductionaws/microtrader-base +FROM 233522827226.dkr.ecr.eu-west-2.amazonaws.com/dockerproductionaws/microtrader-base MAINTAINER Justin Menga LABEL application.component=microtrader-dashboard HEALTHCHECK --interval=3s --retries=20 CMD curl -fs http://localhost:${HTTP_PORT:-8000}/ From 08350bedead9357dfe0071e478476608d94dcda3 Mon Sep 17 00:00:00 2001 From: daleellwood <49533802+daleellwood@users.noreply.github.com> Date: Wed, 18 Sep 2019 11:49:40 +0200 Subject: [PATCH 4/6] Update Dockerfile.portfolio --- docker/release/Dockerfile.portfolio | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/release/Dockerfile.portfolio b/docker/release/Dockerfile.portfolio index 8a7232c..c7b160f 100644 --- a/docker/release/Dockerfile.portfolio +++ b/docker/release/Dockerfile.portfolio @@ -1,8 +1,8 @@ -FROM dockerproductionaws/microtrader-base +FROM 233522827226.dkr.ecr.eu-west-2.amazonaws.com/dockerproductionaws/microtrader-base MAINTAINER Justin Menga LABEL application.component=microtrader-portfolio # Copy application artefacts ARG app_version LABEL application.version=${app_version} -COPY build/jars/microtrader-portfolio-${app_version}-fat.jar /app/app.jar \ No newline at end of file +COPY build/jars/microtrader-portfolio-${app_version}-fat.jar /app/app.jar From e987615edfbbbf958b28cb130386a00e5933c700 Mon Sep 17 00:00:00 2001 From: daleellwood <49533802+daleellwood@users.noreply.github.com> Date: Wed, 18 Sep 2019 11:50:45 +0200 Subject: [PATCH 5/6] Update Dockerfile.quote --- docker/release/Dockerfile.quote | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/release/Dockerfile.quote b/docker/release/Dockerfile.quote index 146acf7..4092e3f 100644 --- a/docker/release/Dockerfile.quote +++ b/docker/release/Dockerfile.quote @@ -1,4 +1,4 @@ -FROM dockerproductionaws/microtrader-base +FROM 233522827226.dkr.ecr.eu-west-2.amazonaws.com/dockerproductionaws/microtrader-base MAINTAINER Justin Menga LABEL application.component=microtrader-quote HEALTHCHECK --interval=3s --retries=20 CMD curl -fs http://localhost:${HTTP_PORT:-35000}/${HTTP_ROOT} @@ -6,4 +6,4 @@ HEALTHCHECK --interval=3s --retries=20 CMD curl -fs http://localhost:${HTTP_PORT # Copy application artefacts ARG app_version LABEL application.version=${app_version} -COPY build/jars/microtrader-quote-${app_version}-fat.jar /app/app.jar \ No newline at end of file +COPY build/jars/microtrader-quote-${app_version}-fat.jar /app/app.jar From f0a30e1f15aab93e1d686eb3bb0caabea6dfcc5e Mon Sep 17 00:00:00 2001 From: dale Date: Wed, 18 Sep 2019 11:13:33 +0000 Subject: [PATCH 6/6] Change makefile --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 9c13146..36448a5 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,11 @@ REPO_NAME ?= microtrader TEST_REPO_NAME ?= microtrader-dev TEST_DIR ?= build/test-results/junit/ +# AWS ECR settings +DOCKER_REGISTRY ?= 233522827226.dkr.ecr.eu-west-2.amazonaws.com +AWS_ACCOUNT_ID ?= 233522827226 +DOCKER_LOGIN_EXPRESSION := eval $$(aws ecr get-login --registry-ids $(AWS_ACCOUNT_ID)) + # Release settings export HTTP_PORT ?= 8000 export AUDIT_HTTP_ROOT ?= /audit/