Browse Source

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
changes/24/670624/1
Roman Gorshunov 2 years ago
parent
commit
da4426d173
  1. 8
      charts/shipyard/values.yaml
  2. 2
      tools/shipyard.sh
  3. 2
      tools/shipyard_docker_base_command.sh

8
charts/shipyard/values.yaml

@ -31,15 +31,15 @@ labels:
images:
tags:
airflow: quay.io/airshipit/airflow:latest
shipyard: quay.io/airshipit/shipyard:latest
airflow: quay.io/airshipit/airflow:latest-ubuntu_xenial
shipyard: quay.io/airshipit/shipyard:latest-ubuntu_xenial
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
shipyard_db_init: 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
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_service: docker.io/openstackhelm/heat:ocata
ks_endpoints: docker.io/openstackhelm/heat:ocata

2
tools/shipyard.sh

@ -38,7 +38,7 @@ set -e
# Source Base Docker Command
SHIPYARD_HOSTPATH=${SHIPYARD_HOSTPATH:-"/target"}
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
# this doesn't actually get exported to environment
# unless the script is sourced

2
tools/shipyard_docker_base_command.sh

@ -19,7 +19,7 @@
# before executing this script if they differ from the default values.
#
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
base_docker_command=$(cat << EndOfCommand

Loading…
Cancel
Save