From 8eda0e1274001588ba6ec6ca4fe4828654917c23 Mon Sep 17 00:00:00 2001
From: Yann Autissier <yann.autissier@gmail.com>
Date: Thu, 15 Dec 2022 16:24:25 +0000
Subject: [PATCH] astroport hostname

---
 Makefile                      | 2 +-
 docker/astroport.mk           | 8 ++++----
 docker/docker-compose.app.yml | 5 ++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index ddcbd388..4e2ae91e 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ SHELL_FILES ?= $(wildcard .*/*.sh */*.sh */*/*.sh)
 all: install tests
 
 .PHONY: install
-install: myos build up player
+install: myos build player up
 	echo "Welcome to myos docker land - make a user - make a player -"
 
 .PHONY: migrate
diff --git a/docker/astroport.mk b/docker/astroport.mk
index 2ff187da..b5809cb4 100644
--- a/docker/astroport.mk
+++ b/docker/astroport.mk
@@ -1,10 +1,10 @@
 COMPOSE_FILE_VDI                          := true
 COMPOSE_IGNORE_ORPHANS                    := true
 DOCKER_IMAGES_MYOS                        := x2go:xfce-debian
-ENV_VARS                                  += HOST_ASTROPORT_SERVICE_1234_TAGS
-HOST_ASTROPORT_SERVICE_URIS               ?= $(patsubst %,astroport.%,$(APP_URIS))
-HOST_ASTROPORT_SERVICE_1234_TAGS          ?= $(call urlprefix,,$(HOST_ASTROPORT_SERVICE_1234_URIS))
-HOST_ASTROPORT_SERVICE_1234_URIS          ?= $(HOST_ASTROPORT_SERVICE_URIS)
+ENV_VARS                                  += HOST_ASTROPORT_SERVICE_DOMAIN HOST_ASTROPORT_SERVICE_NAME HOST_ASTROPORT_SERVICE_1234_TAGS
+HOST_ASTROPORT_SERVICE_DOMAIN             ?= $(firstword $(DOMAIN))
+HOST_ASTROPORT_SERVICE_NAME               ?= astroport
+HOST_ASTROPORT_SERVICE_1234_TAGS          ?= $(call tagprefix,HOST_ASTROPORT,1234)
 HOST_ASTROPORT_UFW_UPDATE                 := 1234/tcp 12245:12445/tcp 45720/tcp
 MAKE_VARS                                 += SSH_PORT User host
 SERVICE                                   := astroport
diff --git a/docker/docker-compose.app.yml b/docker/docker-compose.app.yml
index c1c5558c..8037c088 100644
--- a/docker/docker-compose.app.yml
+++ b/docker/docker-compose.app.yml
@@ -8,9 +8,8 @@ services:
       - GID=${HOST_GID}
       - UID=${HOST_UID}
     container_name: ${COMPOSE_PROJECT_NAME}-astroport
-    environment:
-    - ENV=${ENV}
-    - SHELL=${DOCKER_SHELL}
+    domainname: ${HOST_ASTROPORT_SERVICE_DOMAIN:-localhost}
+    hostname: ${HOST_ASTROPORT_SERVICE_NAME:-astroport}
     image: ${DOCKER_REPOSITORY}/astroport:${DOCKER_IMAGE_TAG}
     labels:
     - SERVICE_1234_CHECK_HTTP=/test