Merge branch 'feature-updateServiceLabels' into 'dev' (ba696398) · Commits · REDMIC Project / Server / Tasks

.gitlab-ci.yml

+1 −6

Original line number	Diff line number	Diff line
		@@ -23,9 +23,6 @@ stages:
		- post-package
		- deploy

		variables:
		PROJECT_PARENT_NAME: api

		.maven-build:
		variables:
		POSTGRES_IMAGE_TAG: 10.13-alpine
		@@ -176,7 +173,5 @@ variables:

		.deploy:
		variables:
		STACK: ${PROJECT_PARENT_NAME}
		STACK: api
		STATUS_CHECK_DELAY: 300
		environment:
		url: https://${PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}

+1 −1

+1 −1

+1 −11

Original line number	Diff line number	Diff line
		version: '3.5'
		version: '3.9'

		services:
		tasks:
		@@ -31,7 +31,6 @@ services:
		kafka-net:
		postgres-net:
		redmic-net:
		traefik-net:
		volumes:
		- mediastorage-private-vol:/data/MEDIA_STORAGE
		- mediastorage-public-vol:/data/PUBLIC_MEDIA_STORAGE
		@@ -44,10 +43,6 @@ services:
		deploy:
		mode: replicated
		replicas: ${REPLICAS:-1}
		labels:
		traefik.frontend.rule: Host:${PUBLIC_HOSTNAME};PathPrefix:/api/${MICROSERVICE_NAME}
		traefik.backend: ${MICROSERVICE_NAME}
		traefik.port: "${MICROSERVICE_PORT}"
		restart_policy:
		delay: ${RESTART_DELAY:-1m}
		update_config:
		@@ -73,8 +68,3 @@ networks:
		name: ${REDMIC_NET_NAME:-redmic-net}
		driver: ${REDMIC_NET_DRIVER:-overlay}
		external: true

		traefik-net:
		name: ${TRAEFIK_NET_NAME:-traefik-net}
		driver: ${TRAEFIK_NET_DRIVER:-overlay}
		external: true

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@
		<modelVersion>4.0.0</modelVersion>
		<artifactId>tasks</artifactId>
		<packaging>jar</packaging>
		<version>0.9.0</version>
		<version>0.9.0-feature-updateServiceLabels</version>
		<name>Tasks</name>
		<description>Tasks server</description>