Skip to content

Commit

Permalink
dcape support added
Browse files Browse the repository at this point in the history
  • Loading branch information
LeKovr committed Jan 9, 2020
1 parent 77f2d73 commit aac3ee5
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
15 changes: 14 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ SOURCES ?= cmd/*/*.go *.go
# -----------------------------------------------------------------------------
# Runtime data

# Site host
APP_SITE ?= logbase.dev.lan

APP_LISTEN ?= :7070

PGHOST ?= db
Expand All @@ -40,13 +43,18 @@ DC_VER ?= 1.23.2
# dcape containers name prefix
DCAPE_PROJECT_NAME ?= dcape
# dcape postgresql container name
DCAPE_DB ?= $(PRG)_db_1
DCAPE_DB ?= $(DCAPE_PROJECT_NAME)_db_1
# dcape network attach to
DCAPE_NET ?= $(DCAPE_PROJECT_NAME)_default


define CONFIG_DEFAULT
# ------------------------------------------------------------------------------
# application config file, generated by make $(CFG)

# Site host
APP_SITE=$(APP_SITE)

# App/Docker listen addr
APP_LISTEN=$(APP_LISTEN)

Expand All @@ -68,6 +76,11 @@ PGPASSWORD=$(PGPASSWORD)
# App name
PGAPPNAME=$(PGAPPNAME)

# dcape network attach to
DCAPE_NET=$(DCAPE_NET)
# dcape postgresql container name
DCAPE_DB=$(DCAPE_DB)

endef
export CONFIG_DEFAULT

Expand Down
3 changes: 3 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ services:
image: ${APP_IMAGE}
command:
--listen=:7070 --path=/data
labels:
- "traefik.enable=true"
- "traefik.frontend.rule=Host:${APP_SITE}"
environment:
- PGHOST=db
- PGPORT=5432
Expand Down

0 comments on commit aac3ee5

Please sign in to comment.