diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d3f16f3..1e28930 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,6 @@ variables: - NOMAD_VAR_PORTS: '{ 8080 = "http", 8182 = "cantaloupe" }' + NOMAD_VAR_PORTS: '{ 8080 = "http" }' NOMAD_VAR_CHECK_PATH: '/static/images/ia.png' - NOMAD_VAR_MULTI_CONTAINER: 'true' NOMAD_VAR_COUNT_CANARIES: 0 NOMAD_VAR_COUNT: 3 NOMAD_VAR_HEALTH_TIMEOUT: '30m' diff --git a/group.nomad b/group.nomad deleted file mode 100644 index 41cf78d..0000000 --- a/group.nomad +++ /dev/null @@ -1,422 +0,0 @@ -task "cantaloupe" { - driver = "docker" - - lifecycle { - hook = "prestart" - sidecar = true - } - - config { - image = "uclalibrary/cantaloupe:5.0.5-7" - ports = [ "cantaloupe" ] - mount { - type = "bind" - target = "/etc/cantaloupe/cantaloupe.properties" - source = "local/cantaloupe.properties" - readonly = true - bind_options { - propagation = "rshared" - } - } - } - - template { -data = < /etc/nginx/conf.d/nginx.conf - -envsubst '$NOMAD_HOST_ADDR_cantaloupe' < settings.cfg > iiify/configs/settings.cfg +cp nginx-vhost.conf /etc/nginx/conf.d/nginx.conf # Call the regular start.sh for the uwsgi container..