From dd2046f58780cb63d630792f264c4e6311d33f7e Mon Sep 17 00:00:00 2001 From: "aynic.os" Date: Fri, 24 Nov 2023 04:07:45 +0000 Subject: [PATCH] port mapping --- docker/docker-compose.app.yml | 15 +++------------ docker/docker-compose.local.yml | 7 +++++++ docker/docker-compose.vdi.yml | 2 ++ docker/docker-compose.yml | 6 ++++++ 4 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 docker/docker-compose.local.yml diff --git a/docker/docker-compose.app.yml b/docker/docker-compose.app.yml index 5a63888a..6ee33ddc 100644 --- a/docker/docker-compose.app.yml +++ b/docker/docker-compose.app.yml @@ -2,16 +2,7 @@ version: '3.6' services: astroport: - build: - args: - - DOCKER_REPOSITORY=${DOCKER_REPOSITORY} - - GID=${HOST_GID} - - UID=${HOST_UID} - container_name: ${COMPOSE_PROJECT_NAME}-astroport - domainname: ${DOMAINNAME:-localhost} - hostname: ${HOSTNAME:-astroport} - image: ${DOCKER_REPOSITORY}/astroport:${DOCKER_IMAGE_TAG} labels: - - SERVICE_1234_CHECK_HTTP=/test - - SERVICE_1234_NAME=${COMPOSE_SERVICE_NAME}-astroport-1234 - - SERVICE_1234_TAGS=${HOST_ASTROPORT_SERVICE_1234_TAGS:-} + - SERVICE_1234_CHECK_HTTP=/ + - SERVICE_1234_NAME=${COMPOSE_SERVICE_NAME:-localhost}-astroport-1234 + - SERVICE_1234_TAGS=${HOST_ASTROPORT_SERVICE_1234_TAGS:-urlprefix-astroport.localhost/} diff --git a/docker/docker-compose.local.yml b/docker/docker-compose.local.yml new file mode 100644 index 00000000..bbae4251 --- /dev/null +++ b/docker/docker-compose.local.yml @@ -0,0 +1,7 @@ +version: '3.6' + +services: + astroport: + ports: + - 1234:1234 + - 12345:12345 diff --git a/docker/docker-compose.vdi.yml b/docker/docker-compose.vdi.yml index 8a5ba594..432ed8be 100644 --- a/docker/docker-compose.vdi.yml +++ b/docker/docker-compose.vdi.yml @@ -3,6 +3,8 @@ version: '3.8' services: astroport: build: + args: + - DOCKER_REPOSITORY=${DOCKER_REPOSITORY} dockerfile: docker/astroport/Dockerfile.vdi cap_add: - IPC_LOCK # ecryptfs diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 758b1530..4320511c 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -5,9 +5,15 @@ services: build: args: - DOCKER_BUILD_DIR=docker/astroport + - GID=${HOST_GID:-123} - IPFS_VERSION=${IPFS_VERSION:-0.24.0} + - UID=${HOST_UID:-123} context: ../ dockerfile: docker/astroport/Dockerfile + container_name: ${COMPOSE_PROJECT_NAME:-localhost}-astroport + domainname: ${DOMAINNAME:-localhost} + hostname: ${HOSTNAME:-astroport} + image: ${DOCKER_REPOSITORY:-localhost}/astroport:${DOCKER_IMAGE_TAG:-latest} restart: unless-stopped ports: - 1234