airship/drydock
Code Issues Proposed changes

Update Makefile

Browse Source 
This ps updates the build commands to allow the same
format to be used in att-comdev projects

Change-Id: Ibc5be98636b2d0f29654a66261df27367ded49a6
This commit is contained in:
Stacey Fletcher 2018-02-21 21:28:24 -06:00
parent 992359fa21
commit e7f630651f
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -12,7 +12,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
DRYDOCK_IMAGE_NAME ?= drydock DOCKER_REGISTRY ?= quay.io
IMAGE_NAME ?= drydock
IMAGE_PREFIX ?= attcomdev IMAGE_PREFIX ?= attcomdev
IMAGE_TAG ?= latest IMAGE_TAG ?= latest
HELM ?= helm HELM ?= helm
@ -20,6 +21,7 @@ PROXY ?= http://one.proxy.att.com:8080
USE_PROXY ?= false USE_PROXY ?= false
PUSH_IMAGE ?= false PUSH_IMAGE ?= false
LABEL ?= commit-id LABEL ?= commit-id
IMAGE ?= ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
export export
# Build all docker images for this project # Build all docker images for this project
@ -65,12 +67,12 @@ dry-run: clean
.PHONY: build_drydock .PHONY: build_drydock
build_drydock: build_drydock:
ifeq ($(USE_PROXY), true) ifeq ($(USE_PROXY), true)
docker build -t $(IMAGE_PREFIX)/$(DRYDOCK_IMAGE_NAME):$(IMAGE_TAG) --label $(LABEL) -f images/drydock/Dockerfile . --build-arg http_proxy=$(PROXY) --build-arg https_proxy=$(PROXY) docker build -t $(IMAGE) --label $(LABEL) -f images/drydock/Dockerfile . --build-arg http_proxy=$(PROXY) --build-arg https_proxy=$(PROXY)
else else
docker build -t $(IMAGE_PREFIX)/$(DRYDOCK_IMAGE_NAME):$(IMAGE_TAG) --label $(LABEL) -f images/drydock/Dockerfile . docker build -t $(IMAGE) --label $(LABEL) -f images/drydock/Dockerfile .
endif endif
ifeq ($(PUSH_IMAGE), true) ifeq ($(PUSH_IMAGE), true)
docker push $(IMAGE_PREFIX)/$(DRYDOCK_IMAGE_NAME):$(IMAGE_TAG) docker push $(IMAGE)
endif endif

6
tests/postgres/start_postgres.sh
View File

@ -1,13 +1,13 @@
#!/bin/bash #!/bin/bash
set -x set -x
DRYDOCK_IMAGE="${IMAGE_PREFIX}/${DRYDOCK_IMAGE_NAME}:${IMAGE_TAG}" IMAGE="${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}"
if [[ ! -z $(docker ps | grep 'psql_integration') ]] if [[ ! -z $(docker ps | grep 'psql_integration') ]]
then then
sudo docker stop 'psql_integration' sudo docker stop 'psql_integration'
fi fi
DRYDOCK_IMAGE=${DRYDOCK_IMAGE:-"drydock:latest"} IMAGE=${IMAGE:-"drydock:latest"}
if [[ ! -z $(docker ps | grep 'psql_integration') ]] if [[ ! -z $(docker ps | grep 'psql_integration') ]]
then then
@ -22,4 +22,4 @@ docker run --rm --net host postgres:9.5 psql -h localhost -c "create database dr
export DRYDOCK_DB_URL="postgresql+psycopg2://drydock:drydock@localhost:5432/drydock" export DRYDOCK_DB_URL="postgresql+psycopg2://drydock:drydock@localhost:5432/drydock"
sudo docker run --rm -t --net=host -e DRYDOCK_DB_URL="$DRYDOCK_DB_URL" --entrypoint /usr/local/bin/alembic $DRYDOCK_IMAGE upgrade head sudo docker run --rm -t --net=host -e DRYDOCK_DB_URL="$DRYDOCK_DB_URL" --entrypoint /usr/local/bin/alembic $IMAGE upgrade head

6
tools/drydock_image_run.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -x set -x
DRYDOCK_IMAGE="${IMAGE_PREFIX}/${DRYDOCK_IMAGE_NAME}:${IMAGE_TAG}" IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
function start_db { function start_db {
if [[ ! -z $(docker ps | grep 'psql_integration') ]] if [[ ! -z $(docker ps | grep 'psql_integration') ]]
@ -40,7 +40,7 @@ function init_db {
docker run --rm -t --net=host \ docker run --rm -t --net=host \
-e DRYDOCK_DB_URL="${DRYDOCK_DB_URL}" \ -e DRYDOCK_DB_URL="${DRYDOCK_DB_URL}" \
--entrypoint /usr/local/bin/alembic \ --entrypoint /usr/local/bin/alembic \
${DRYDOCK_IMAGE} \ ${IMAGE} \
upgrade head upgrade head
} }
@ -49,7 +49,7 @@ function test_drydock {
docker run \ docker run \
-d --name 'drydock_test' --net host \ -d --name 'drydock_test' --net host \
-v ${TMPETC}:/etc/drydock \ -v ${TMPETC}:/etc/drydock \
${DRYDOCK_IMAGE} ${IMAGE}
sleep 10 sleep 10

4
tox.ini
View File

@ -36,7 +36,7 @@ commands=
{toxinidir}/tests/unit/{posargs} {toxinidir}/tests/unit/{posargs}
[testenv:integration] [testenv:integration]
passenv=DRYDOCK_IMAGE_NAME IMAGE_PREFIX IMAGE_TAG passenv=DOCKER_REGISTRY IMAGE_NAME IMAGE_PREFIX IMAGE_TAG
setenv= setenv=
PYTHONWARNING=all PYTHONWARNING=all
YAMLDIR={toxinidir}/tests/yaml_samples/ YAMLDIR={toxinidir}/tests/yaml_samples/
@ -47,7 +47,7 @@ commands=
[testenv:coverage] [testenv:coverage]
usedevelop=True usedevelop=True
passenv=DRYDOCK_IMAGE_NAME IMAGE_PREFIX IMAGE_TAG passenv=DOCKER_REGISTRY IMAGE_NAME IMAGE_PREFIX IMAGE_TAG
setenv= setenv=
YAMLDIR={toxinidir}/tests/yaml_samples/ YAMLDIR={toxinidir}/tests/yaml_samples/
commands= commands=