From da4426d17307e234b470e34f8c66da97d7555643 Mon Sep 17 00:00:00 2001 From: Roman Gorshunov Date: Fri, 12 Jul 2019 21:19:36 +0200 Subject: [PATCH] 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 --- charts/shipyard/values.yaml | 8 ++++---- tools/shipyard.sh | 2 +- tools/shipyard_docker_base_command.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/shipyard/values.yaml b/charts/shipyard/values.yaml index 67d248cd..edd87598 100644 --- a/charts/shipyard/values.yaml +++ b/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 diff --git a/tools/shipyard.sh b/tools/shipyard.sh index abdcfef9..861a7276 100755 --- a/tools/shipyard.sh +++ b/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 diff --git a/tools/shipyard_docker_base_command.sh b/tools/shipyard_docker_base_command.sh index a5a9f0a1..38408987 100644 --- a/tools/shipyard_docker_base_command.sh +++ b/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