airship/armada
Code Issues Proposed changes

Updating Quay Namespace to airshipit

Browse Source 
Change-Id: Ia405260431819906a633cb023ab24a2773847de8
This commit is contained in:
Aaron Sheffield 2018-08-15 09:43:30 -05:00
parent 5165457d5c
commit 019b3c142e
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -14,7 +14,7 @@
# APP INFO # APP INFO
DOCKER_REGISTRY ?= quay.io DOCKER_REGISTRY ?= quay.io
IMAGE_PREFIX ?= attcomdev IMAGE_PREFIX ?= airshipit
IMAGE_NAME ?= armada IMAGE_NAME ?= armada
IMAGE_TAG ?= latest IMAGE_TAG ?= latest
HELM ?= helm HELM ?= helm

2
README.rst
View File

@ -64,7 +64,7 @@ Afterward, you can launch the Armada container by executing:
$ sudo docker run -d --net host -p 8000:8000 --name armada \ $ sudo docker run -d --net host -p 8000:8000 --name armada \
-v ~/.kube/config:/armada/.kube/config \ -v ~/.kube/config:/armada/.kube/config \
-v $(pwd)/examples/:/examples quay.io/attcomdev/armada:latest -v $(pwd)/examples/:/examples quay.io/airshipit/armada:latest
Manual Installation Manual Installation
^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^

2
charts/armada/values.yaml
View File

@ -25,7 +25,7 @@ labels:
images: images:
tags: tags:
api: 'quay.io/attcomdev/armada:latest' api: 'quay.io/airshipit/armada:latest'
dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.3.1' dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.3.1'
ks_endpoints: 'docker.io/openstackhelm/heat:newton' ks_endpoints: 'docker.io/openstackhelm/heat:newton'
ks_service: 'docker.io/openstackhelm/heat:newton' ks_service: 'docker.io/openstackhelm/heat:newton'

6
controller.sh
View File

@ -14,7 +14,7 @@ readlink(){
} }
# Check to see if the aramada container exists # Check to see if the aramada container exists
if [ -n "$( sudo docker ps -a | grep quay.io/attcomdev/armada )" ]; then if [ -n "$( sudo docker ps -a | grep quay.io/airshipit/armada )" ]; then
echo "Armada container already exists..." echo "Armada container already exists..."
clean_container armada clean_container armada
fi fi
@ -24,13 +24,13 @@ if [ $1 = "apply" ]; then
# TODO Handle erroneous or missing inputs # TODO Handle erroneous or missing inputs
# Bring up a new armada container with passed in yaml mounted to the container # Bring up a new armada container with passed in yaml mounted to the container
echo "Creating an Armada container..." echo "Creating an Armada container..."
docker run -d --net host -p 8000:8000 --name armada -v $(readlink $(dirname $2)):$(readlink $(dirname $2)) -v ~/.kube/config:/armada/.kube/config -v ~/.kube/plugins/armada/examples/:/examples quay.io/attcomdev/armada:latest docker run -d --net host -p 8000:8000 --name armada -v $(readlink $(dirname $2)):$(readlink $(dirname $2)) -v ~/.kube/config:/armada/.kube/config -v ~/.kube/plugins/armada/examples/:/examples quay.io/airshipit/armada:latest
docker exec armada armada apply $(readlink $2) docker exec armada armada apply $(readlink $2)
else else
# For any other command the chart does not need to be mounted to the container # For any other command the chart does not need to be mounted to the container
# Bring up a new armada container # Bring up a new armada container
echo "Creating an Armada container..." echo "Creating an Armada container..."
docker run -d --net host -p 8000:8000 --name armada -v ~/.kube/config:/armada/.kube/config -v ~/.kube/plugins/armada/examples/:/examples quay.io/attcomdev/armada:latest docker run -d --net host -p 8000:8000 --name armada -v ~/.kube/config:/armada/.kube/config -v ~/.kube/plugins/armada/examples/:/examples quay.io/airshipit/armada:latest
docker exec armada armada "$@" docker exec armada armada "$@"
fi fi
clean_container armada clean_container armada