mirror of
				https://github.com/samply/bridgehead.git
				synced 2025-11-04 01:20:17 +01:00 
			
		
		
		
	Merge pull request #197 from samply/beam-tag
In ENVIRONMENT=production, use main tag for Samply.Beam.
This commit is contained in:
		@@ -16,7 +16,7 @@ services:
 | 
			
		||||
      - "blaze"
 | 
			
		||||
 | 
			
		||||
  beam-proxy-eric:
 | 
			
		||||
    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:develop
 | 
			
		||||
    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:${BEAM_TAG}
 | 
			
		||||
    container_name: bridgehead-beam-proxy-eric
 | 
			
		||||
    environment:
 | 
			
		||||
      BROKER_URL: ${ERIC_BROKER_URL}
 | 
			
		||||
 
 | 
			
		||||
@@ -16,7 +16,7 @@ services:
 | 
			
		||||
      - "blaze"
 | 
			
		||||
 | 
			
		||||
  beam-proxy-gbn:
 | 
			
		||||
    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:develop
 | 
			
		||||
    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:${BEAM_TAG}
 | 
			
		||||
    container_name: bridgehead-beam-proxy-gbn
 | 
			
		||||
    environment:
 | 
			
		||||
      BROKER_URL: ${GBN_BROKER_URL}
 | 
			
		||||
 
 | 
			
		||||
@@ -80,13 +80,16 @@ loadVars() {
 | 
			
		||||
	case "$ENVIRONMENT" in
 | 
			
		||||
		"production")
 | 
			
		||||
			export FOCUS_TAG=main
 | 
			
		||||
			export BEAM_TAG=main
 | 
			
		||||
			;;
 | 
			
		||||
		"test")
 | 
			
		||||
			export FOCUS_TAG=develop
 | 
			
		||||
			export BEAM_TAG=develop
 | 
			
		||||
			;;
 | 
			
		||||
		*)
 | 
			
		||||
			report_error 7 "Environment \"$ENVIRONMENT\" is unknown. Assuming production. FIX THIS!"
 | 
			
		||||
			export FOCUS_TAG=main
 | 
			
		||||
			export BEAM_TAG=main
 | 
			
		||||
			;;
 | 
			
		||||
	esac
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -36,7 +36,7 @@ services:
 | 
			
		||||
      - "blaze"
 | 
			
		||||
 | 
			
		||||
  beam-proxy:
 | 
			
		||||
    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:develop
 | 
			
		||||
    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:${BEAM_TAG}
 | 
			
		||||
    container_name: bridgehead-beam-proxy
 | 
			
		||||
    environment:
 | 
			
		||||
      BROKER_URL: ${BROKER_URL}
 | 
			
		||||
 
 | 
			
		||||
@@ -36,7 +36,7 @@ services:
 | 
			
		||||
      - "blaze"
 | 
			
		||||
 | 
			
		||||
  beam-proxy:
 | 
			
		||||
    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:develop
 | 
			
		||||
    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:${BEAM_TAG}
 | 
			
		||||
    container_name: bridgehead-beam-proxy
 | 
			
		||||
    environment:
 | 
			
		||||
      BROKER_URL: ${BROKER_URL}
 | 
			
		||||
 
 | 
			
		||||
@@ -36,7 +36,7 @@ services:
 | 
			
		||||
      - "blaze"
 | 
			
		||||
 | 
			
		||||
  beam-proxy:
 | 
			
		||||
    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:develop
 | 
			
		||||
    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:${BEAM_TAG}
 | 
			
		||||
    container_name: bridgehead-beam-proxy
 | 
			
		||||
    environment:
 | 
			
		||||
      BROKER_URL: ${BROKER_URL}
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@ version: "3.7"
 | 
			
		||||
 | 
			
		||||
services:
 | 
			
		||||
  dnpm-beam-proxy:
 | 
			
		||||
    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:develop
 | 
			
		||||
    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:${BEAM_TAG}
 | 
			
		||||
    container_name: bridgehead-dnpm-beam-proxy
 | 
			
		||||
    environment:
 | 
			
		||||
      BROKER_URL: ${DNPM_BROKER_URL}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user