Skip to content

Commit

Permalink
Merge pull request #13 from dannylamb/building-microservices
Browse files Browse the repository at this point in the history
Adding boilerplate to build microservices
  • Loading branch information
Gavin Morris authored Mar 12, 2020
2 parents 1c7497a + f580b6a commit af9e735
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 14 deletions.
10 changes: 10 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -162,3 +162,13 @@ ALPACA_INDEXING_TRIPLESTORE_DELETE_QUEUE=broker:queue:islandora-indexing-triples
ALPACA_INDEXING_TRIPLESTORE_FCREPO_QUEUE=broker:topic:fedora
ALPACA_INDEXING_TRIPLESTORE_FCREPO_REINDEXING_QUEUE=broker:queue:triplestore.reindex

### --- Microservice Build ARGs ----

HYPERCUBE_JWT_ADMIN_TOKEN=islandora
HYPERCUBE_LOG_LEVEL=DEBUG

HOMARUS_JWT_ADMIN_TOKEN=islandora
HOMARUS_LOG_LEVEL=DEBUG

HOUDINI_JWT_ADMIN_TOKEN=islandora
HOUDINI_LOG_LEVEL=DEBUG
31 changes: 19 additions & 12 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,17 +128,15 @@ services:
houdini:
image: borndigital/isle-houdini:mvp2-alpha
# build:
# context: https://github.com/Islandora-Devops/isle-houdini.git
# context: https://github.com/Islandora-Devops/isle-houdini.git#dev
# args:
# HOUDINI_JWT_ADMIN_TOKEN: $HOUDINI_JWT_ADMIN_TOKEN
# HOUDINI_LOG_LEVEL: $HOUDINI_LOG_LEVEL
container_name: "${PROJECT_NAME}_houdini"
networks:
- internal
env_file:
- houdini.env
ports:
- "8000:8000" # To make mgmt console available for dev purposes. use admin:admin to log in
# ports:
# - "8000:8000"
volumes:
- ./jwt:/opt/jwt
- ./config/crayfish/php.ini:/usr/local/etc/php/php.ini
Expand All @@ -148,28 +146,39 @@ services:

homarus:
image: borndigital/isle-homarus:mvp2-alpha
# build:
# context: https://github.com/Islandora-Devops/isle-homarus.git#dev
# args:
# HOMARUS_JWT_ADMIN_TOKEN: $HOMARUS_JWT_ADMIN_TOKEN
# HOMARUS_LOG_LEVEL: $HOMARUS_LOG_LEVEL
container_name: "${PROJECT_NAME}_homarus"
networks:
- internal
# TO DO: Determine what type of container handling is needed, exposed ports etc?
# ports:
# - "8001:8000"
volumes:
- ./jwt:/opt/jwt
- ./config/crayfish/php.ini:/usr/local/etc/php/php.ini
#labels:
# - "traefik.http.routers.${PROJECT_NAME}_homarus.rule=Host(`homarus.${PROJECT_BASE_URL}`)"


hypercube:
image: borndigital/isle-hypercube:mvp2-alpha
# build:
# context: https://github.com/Islandora-Devops/isle-hypercube.git#dev
# args:
# HYPERCUBE_JWT_ADMIN_TOKEN: $HYPERCUBE_JWT_ADMIN_TOKEN
# HYPERCUBE_LOG_LEVEL: $HYPERCUBE_LOG_LEVEL
container_name: "${PROJECT_NAME}_hypercube"
networks:
- internal
# TO DO: Determine what type of container handling is needed, exposed ports etc?
# ports:
# - "8002:8000"
volumes:
- ./jwt:/opt/jwt
- ./config/crayfish/php.ini:/usr/local/etc/php/php.ini
#labels:
# - "traefik.http.routers.${PROJECT_NAME}_hypercube.rule=Host(`hypercube.${PROJECT_BASE_URL}`)"


fits:
image: harvardlts/fitsservlet_container:1.5.0
container_name: "${PROJECT_NAME}_fits"
Expand Down Expand Up @@ -225,8 +234,6 @@ services:
env_file: .env
ports:
- "8161:8161" # To make mgmt console available for dev purposes. use admin:admin to log in
- "61613:61613" # STOMP port
- "61616:61616" # JMS port
networks:
- internal
volumes:
Expand Down
2 changes: 0 additions & 2 deletions houdini.env

This file was deleted.

0 comments on commit af9e735

Please sign in to comment.