Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TestPull #9

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

TestPull #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
211e211
Testing 1st commit
daleellwood Sep 11, 2019
1dce417
Update Dockerfile.audit
daleellwood Sep 18, 2019
f6c66d4
Update Dockerfile.dashboard
daleellwood Sep 18, 2019
08350be
Update Dockerfile.portfolio
daleellwood Sep 18, 2019
e987615
Update Dockerfile.quote
daleellwood Sep 18, 2019
ac77c69
Merge branch 'master' of https://github.com/daleellwood/microtrader
daleellwood Sep 18, 2019
f0a30e1
Change makefile
daleellwood Sep 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
4 changes: 2 additions & 2 deletions docker/release/Dockerfile.audit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM dockerproductionaws/microtrader-base
FROM 233522827226.dkr.ecr.eu-west-2.amazonaws.com/dockerproductionaws/microtrader-base
MAINTAINER Justin Menga <[email protected]>
LABEL application.component=microtrader-audit
HEALTHCHECK --interval=3s --retries=20 CMD curl -fs http://localhost:${HTTP_PORT:-33000}/${HTTP_ROOT}

# Copy application artefacts
ARG app_version
LABEL application.version=${app_version}
COPY build/jars/microtrader-audit-${app_version}-fat.jar /app/app.jar
COPY build/jars/microtrader-audit-${app_version}-fat.jar /app/app.jar
2 changes: 1 addition & 1 deletion docker/release/Dockerfile.dashboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM dockerproductionaws/microtrader-base
FROM 233522827226.dkr.ecr.eu-west-2.amazonaws.com/dockerproductionaws/microtrader-base
MAINTAINER Justin Menga <[email protected]>
LABEL application.component=microtrader-dashboard
HEALTHCHECK --interval=3s --retries=20 CMD curl -fs http://localhost:${HTTP_PORT:-8000}/
Expand Down
4 changes: 2 additions & 2 deletions docker/release/Dockerfile.portfolio
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM dockerproductionaws/microtrader-base
FROM 233522827226.dkr.ecr.eu-west-2.amazonaws.com/dockerproductionaws/microtrader-base
MAINTAINER Justin Menga <[email protected]>
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
COPY build/jars/microtrader-portfolio-${app_version}-fat.jar /app/app.jar
4 changes: 2 additions & 2 deletions docker/release/Dockerfile.quote
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM dockerproductionaws/microtrader-base
FROM 233522827226.dkr.ecr.eu-west-2.amazonaws.com/dockerproductionaws/microtrader-base
MAINTAINER Justin Menga <[email protected]>
LABEL application.component=microtrader-quote
HEALTHCHECK --interval=3s --retries=20 CMD curl -fs http://localhost:${HTTP_PORT:-35000}/${HTTP_ROOT}

# Copy application artefacts
ARG app_version
LABEL application.version=${app_version}
COPY build/jars/microtrader-quote-${app_version}-fat.jar /app/app.jar
COPY build/jars/microtrader-quote-${app_version}-fat.jar /app/app.jar
8 changes: 3 additions & 5 deletions microtrader-portfolio/src/main/asciidoc/dataobjects.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
+++
|===
Expand Down