From 484e8689a4983f62c7c31c7e5a38a1af367c5d60 Mon Sep 17 00:00:00 2001 From: Darren Clarke Date: Wed, 15 Feb 2023 16:25:51 +0000 Subject: [PATCH] Compose updates --- .gitpod.yml | 10 ------ Makefile | 4 +-- docker-compose.yml | 81 ++++++++++++++++++++++++++++------------------ 3 files changed, 51 insertions(+), 44 deletions(-) delete mode 100644 .gitpod.yml diff --git a/.gitpod.yml b/.gitpod.yml deleted file mode 100644 index 63a3e4f..0000000 --- a/.gitpod.yml +++ /dev/null @@ -1,10 +0,0 @@ -# This configuration file was automatically generated by Gitpod. -# Please adjust to your needs (see https://www.gitpod.io/docs/introduction/learn-gitpod/gitpod-yaml) -# and commit this file to your remote git repository to share the goodness with others. - -# Learn more from ready-to-use templates: https://www.gitpod.io/docs/introduction/getting-started/quickstart - -tasks: - - init: make - - diff --git a/Makefile b/Makefile index 4b78b9a..56eafbd 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ CURRENT_UID := $(shell id -u):$(shell id -g) -PACKAGE_NAME ?= $(shell jq -r '.name' link/package.json) -PACKAGE_VERSION?= $(shell jq -r '.version' link/package.json) +PACKAGE_NAME ?= $(shell jq -r '.name' package.json) +PACKAGE_VERSION?= $(shell jq -r '.version' package.json) BUILD_DATE ?=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ") DOCKER_ARGS ?= DOCKER_NS ?= registry.gitlab.com/digiresilience/link/${PACKAGE_NAME} diff --git a/docker-compose.yml b/docker-compose.yml index 7b40090..31ae1d6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,14 +38,17 @@ x-metamigo-vars: services: zammad-elasticsearch: + container_name: zammad-elasticsearch environment: - discovery.type=single-node + - ingest.geoip.downloader.enabled=false build: ./docker/elasticsearch restart: ${RESTART} volumes: - elasticsearch-data:/usr/share/elasticsearch/data zammad-init: + container_name: zammad-init command: [ "zammad-init" ] depends_on: - zammad-postgresql @@ -59,26 +62,32 @@ services: - zammad-data:/opt/zammad zammad-memcached: + container_name: zammad-memcached command: memcached -m 256M build: ./docker/memcached restart: ${RESTART} zammad-nginx: + container_name: zammad-nginx command: [ "zammad-nginx" ] expose: - - "80" + - "8080" + ports: + - 127.0.0.1:8001:8080 depends_on: - zammad-railsserver build: ./docker/zammad restart: ${RESTART} environment: + NGINX_SERVER_SCHEME: https VIRTUAL_HOST: ${ZAMMAD_VIRTUAL_HOST} - VIRTUAL_PORT: 80 + VIRTUAL_PORT: 8080 volumes: - zammad-data:/opt/zammad zammad-postgresql: + container_name: zammad-postgresql environment: - POSTGRES_USER=zammad - POSTGRES_PASSWORD=${ZAMMAD_DATABASE_PASSWORD} @@ -88,6 +97,7 @@ services: - postgresql-data:/var/lib/postgresql/data zammad-railsserver: + container_name: zammad-railsserver command: [ "zammad-railsserver" ] depends_on: - zammad-memcached @@ -100,10 +110,12 @@ services: - zammad-data:/opt/zammad zammad-redis: + container_name: zammad-redis build: ./docker/redis restart: ${RESTART} zammad-scheduler: + container_name: zammad-scheduler command: [ "zammad-scheduler" ] depends_on: - zammad-memcached @@ -116,6 +128,7 @@ services: - zammad-data:/opt/zammad zammad-websocket: + container_name: zammad-websocket command: [ "zammad-websocket" ] depends_on: - zammad-memcached @@ -127,41 +140,41 @@ services: volumes: - zammad-data:/opt/zammad - metamigo-api: - build: ./apps/metamigo-api - container_name: metamigo-api - restart: ${RESTART} - command: [ "api" ] - expose: - - "3001" - environment: *common-metamigo-variables - volumes: - - ./signald:/signald + # metamigo-api: + # build: ./apps/metamigo-api + # container_name: metamigo-api + # restart: ${RESTART} + # command: [ "api" ] + # expose: + # - "3001" + # environment: *common-metamigo-variables + # volumes: + # - ./signald:/signald - metamigo-frontend: - build: ./apps/metamigo-frontend - container_name: metamigo-frontend - restart: ${RESTART} - command: [ "frontend" ] - expose: - - "3000" - ports: - - 127.0.0.1:8002:3000 - environment: - <<: *common-metamigo-variables - VIRTUAL_HOST: ${METAMIGO_VIRTUAL_HOST} - VIRTUAL_PORT: 3000 + # metamigo-frontend: + # build: ./apps/metamigo-frontend + # container_name: metamigo-frontend + # restart: ${RESTART} + # command: [ "frontend" ] + # expose: + # - "3000" + # ports: + # - 127.0.0.1:8002:3000 + # environment: + # <<: *common-metamigo-variables + # VIRTUAL_HOST: ${METAMIGO_VIRTUAL_HOST} + # VIRTUAL_PORT: 3000 - metamigo-worker: - build: ./apps/metamigo-worker - container_name: metamigo-worker - restart: ${RESTART} - command: [ "worker" ] - environment: *common-metamigo-variables + # metamigo-worker: + # build: ./apps/metamigo-worker + # container_name: metamigo-worker + # restart: ${RESTART} + # command: [ "worker" ] + # environment: *common-metamigo-variables metamigo-postgresql: - build: ./docker/postgresql container_name: metamigo-postgresql + build: ./docker/postgresql restart: ${RESTART} volumes: - metamigo-data:/var/lib/postgresql/data @@ -177,6 +190,7 @@ services: - 127.0.0.1:5432:5432 signald: + container_name: signald build: ./docker/signald restart: ${RESTART} user: ${CURRENT_UID} @@ -184,6 +198,7 @@ services: - ../signald:/signald nginx-proxy: + container_name: nginx-proxy build: ./docker/nginx-proxy restart: ${RESTART} ports: @@ -192,6 +207,7 @@ services: - /var/run/docker.sock:/tmp/docker.sock:ro link: + container_name: link build: ./apps/link expose: - "3000" @@ -204,6 +220,7 @@ services: ZAMMAD_VIRUAL_HOST: ${ZAMMAD_VIRTUAL_HOST} zammad-proxy: + container_name: zammad-proxy build: ./apps/zammad-proxy expose: - "3000"