Commit de78264d authored by Robert Butora's avatar Robert Butora
Browse files

makes AMQP configurable by AMQP_QUEUE_NAME compose-param

parent 6a349195

docker/entrypoint.sh

+9 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ echo "RESPONSE_FORMAT : "$RESPONSE_FORMAT 
echo "URL_CUTOUTS         : "$URL_CUTOUTS

echo "RESOLVER_DB_*       : "$RESOLVER_DB_URI" ["$RESOLVER_DB_SCHEMA"] "$RESOLVER_DB_USERNAME" / "$RESOLVER_DB_PASSWORD

echo "VLKBOBSCORE_PG_URI  : "$VLKBOBSCORE_PG_URI

echo "AMQP_QUEUE_NAME     : "$AMQP_QUEUE_NAME



echo "build-time config'd (Dockefile):"

echo "INST_DIR   : "$INST_DIR
@@ -51,17 +52,23 @@ echo "fits_path_surveys=/srv/surveys" > $WEBAPP_DIR/WEB-INF/classes/cutout.prope 
      "application/fits;createfile=yes")

         echo "default_response_format=$RESPONSE_FORMAT"

         echo "fits_path_cutouts=/srv/cutouts"

         QUEUE_NAME=dockervlkb$ACCESS_CONTEXT_ROOT

         if test -n "$AMQP_QUEUE_NAME"

         then

            QUEUE_NAME=dockervlkb$AMQP_QUEUE_NAME

         fi

         ;;

      application/x-vlkb*)

         echo "default_response_format=$RESPONSE_FORMAT"

         echo "fits_path_cutouts=/srv/cutouts"

         echo "fits_url_cutouts=$URL_CUTOUTS"

         echo "surveys_metadata_abs_pathname=/srv/surveys/survey_populate.csv"

         QUEUE_NAME=dockervlkb$ACCESS_CONTEXT_ROOT

         echo "default_sky_system=GALACTIC"

         echo "default_spec_system=VELO_LSRK"

         echo "show_duration=yes"

         if test -n "$AMQP_QUEUE_NAME"

         then

            QUEUE_NAME=dockervlkb$AMQP_QUEUE_NAME

         fi

         ;;

   esac

docker/example-compose-vlkb.yaml

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ services: 
      - RESPONSE_FORMAT=application/x-vlkb+xml

      #- RESPONSE_FORMAT=application/fits

      #- RESPONSE_FORMAT=application/fits;createfile=yes

      #- AMQP_QUEUE_NAME=vlkb#datasets

    volumes:

      - /srv/vlkb/surveys:/srv/surveys:z,ro

      - /srv/vlkb/cutouts:/srv/cutouts:z,rw