Set default images to Ubuntu Xenial -based images
Since ':master' and ':latest' Shipyard and Airflow images are outdated, set defaults to Ubuntu Xenial -based images. Change-Id: I40978747f31c6a8c5cc8689a9768f8c4836ac1a1
This commit is contained in:
parent
aeb0c198b1
commit
da4426d173
|
@ -31,15 +31,15 @@ labels:
|
||||||
|
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
airflow: quay.io/airshipit/airflow:latest
|
airflow: quay.io/airshipit/airflow:latest-ubuntu_xenial
|
||||||
shipyard: quay.io/airshipit/shipyard:latest
|
shipyard: quay.io/airshipit/shipyard:latest-ubuntu_xenial
|
||||||
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
||||||
shipyard_db_init: docker.io/postgres:9.5
|
shipyard_db_init: docker.io/postgres:9.5
|
||||||
shipyard_db_auxiliary: docker.io/postgres:9.5
|
shipyard_db_auxiliary: docker.io/postgres:9.5
|
||||||
shipyard_db_sync: quay.io/airshipit/shipyard:latest
|
shipyard_db_sync: quay.io/airshipit/shipyard:latest-ubuntu_xenial
|
||||||
airflow_db_init: docker.io/postgres:9.5
|
airflow_db_init: docker.io/postgres:9.5
|
||||||
rabbit_init: docker.io/rabbitmq:3.7-management
|
rabbit_init: docker.io/rabbitmq:3.7-management
|
||||||
airflow_db_sync: quay.io/airshipit/airflow:latest
|
airflow_db_sync: quay.io/airshipit/airflow:latest-ubuntu_xenial
|
||||||
ks_user: docker.io/openstackhelm/heat:ocata
|
ks_user: docker.io/openstackhelm/heat:ocata
|
||||||
ks_service: docker.io/openstackhelm/heat:ocata
|
ks_service: docker.io/openstackhelm/heat:ocata
|
||||||
ks_endpoints: docker.io/openstackhelm/heat:ocata
|
ks_endpoints: docker.io/openstackhelm/heat:ocata
|
||||||
|
|
|
@ -38,7 +38,7 @@ set -e
|
||||||
# Source Base Docker Command
|
# Source Base Docker Command
|
||||||
SHIPYARD_HOSTPATH=${SHIPYARD_HOSTPATH:-"/target"}
|
SHIPYARD_HOSTPATH=${SHIPYARD_HOSTPATH:-"/target"}
|
||||||
NAMESPACE="${NAMESPACE:-ucp}"
|
NAMESPACE="${NAMESPACE:-ucp}"
|
||||||
SHIPYARD_IMAGE="${SHIPYARD_IMAGE:-quay.io/airshipit/shipyard:master}"
|
SHIPYARD_IMAGE="${SHIPYARD_IMAGE:-quay.io/airshipit/shipyard:master-ubuntu_xenial}"
|
||||||
# set default value for OS_PASSWORD if it's not set
|
# set default value for OS_PASSWORD if it's not set
|
||||||
# this doesn't actually get exported to environment
|
# this doesn't actually get exported to environment
|
||||||
# unless the script is sourced
|
# unless the script is sourced
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
# before executing this script if they differ from the default values.
|
# before executing this script if they differ from the default values.
|
||||||
#
|
#
|
||||||
NAMESPACE="${NAMESPACE:-ucp}"
|
NAMESPACE="${NAMESPACE:-ucp}"
|
||||||
SHIPYARD_IMAGE="${SHIPYARD_IMAGE:-quay.io/airshipit/shipyard:master}"
|
SHIPYARD_IMAGE="${SHIPYARD_IMAGE:-quay.io/airshipit/shipyard:master-ubuntu_xenial}"
|
||||||
|
|
||||||
# Define Base Docker Command
|
# Define Base Docker Command
|
||||||
base_docker_command=$(cat << EndOfCommand
|
base_docker_command=$(cat << EndOfCommand
|
||||||
|
|
Loading…
Reference in New Issue