Commit 5c9e1614 authored by Stewart Williams's avatar Stewart Williams
Browse files

Use ska-python image as base docker image 

Introduce 'make test' procedure
parent 6cfafd18

.dockerignore

0 → 100644
+27 −0
Original line number Diff line number Diff line 
*.py[cod]

*.egg-info

*.eggs

.ipynb_checkpoints



build

dist

.cache

__pycache__



htmlcov

.coverage

coverage.xml

.pytest_cache



# ide

.idea

.eclipse

.vscode



.make

Makefile

Dockerfile

.release

.gitlab-ci.yml

.gitignore

.gitignore

+0 −2
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ dist 
.cache

__pycache__



Pipfile.lock



htmlcov

.coverage

coverage.xml

.make/.make-release-support

0 → 100644
+105 −0
Original line number Diff line number Diff line 
#!/bin/bash

#

#   Copyright 2015  Xebia Nederland B.V.

#

#   Licensed under the Apache License, Version 2.0 (the "License");

#   you may not use this file except in compliance with the License.

#   You may obtain a copy of the License at

#

#       http://www.apache.org/licenses/LICENSE-2.0

#

#   Unless required by applicable law or agreed to in writing, software

#   distributed under the License is distributed on an "AS IS" BASIS,

#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

#   See the License for the specific language governing permissions and

#   limitations under the License.

#

function hasChanges() {

	test -n "$(git status -s .)"

}



function getRelease() {

	awk -F= '/^release=/{print $2}' .release

}



function getBaseTag() {

		sed -n -e "s/^tag=\(.*\)$(getRelease)\$/\1/p" .release

}



function getTag() {

	if [ -z "$1" ] ; then

		awk -F= '/^tag/{print $2}' .release

	else

		echo "$(getBaseTag)$1"

	fi

}



function setRelease() {

	if [ -n "$1" ] ; then

		sed -i.x -e "s/^tag=.*/tag=$(getTag $1)/" .release

		sed -i.x -e "s/^release=.*/release=$1/g" .release

		rm -f .release.x

		runPreTagCommand "$1"

	else

		echo "ERROR: missing release version parameter " >&2

		return 1

	fi

}



function runPreTagCommand() {

	if [ -n "$1" ] ; then

		COMMAND=$(sed -n -e "s/@@RELEASE@@/$1/g" -e 's/^pre_tag_command=\(.*\)/\1/p' .release)

		if [ -n "$COMMAND" ] ; then

			if ! OUTPUT=$(bash -c "$COMMAND" 2>&1) ; then echo $OUTPUT >&2 && exit 1 ; fi

		fi

	else

		echo "ERROR: missing release version parameter " >&2

		return 1

	fi

}



function tagExists() {

	tag=${1:-$(getTag)}

	test -n "$tag" && test -n "$(git tag | grep "^$tag\$")"

}



function differsFromRelease() {

	tag=$(getTag)

	! tagExists $tag || test -n "$(git diff --shortstat -r $tag .)"

}



function getVersion() {

	result=$(getRelease)



	if differsFromRelease; then

		result="$result-$(git log -n 1 --format=%h .)"

	fi



	if hasChanges ; then

		result="$result-dirty"

	fi

	echo $result

}



function nextPatchLevel() {

	version=${1:-$(getRelease)}

	major_and_minor=$(echo $version | cut -d. -f1,2)

	patch=$(echo $version | cut -d. -f3)

	version=$(printf "%s.%d" $major_and_minor $(($patch + 1)))

	echo $version

}



function nextMinorLevel() {

	version=${1:-$(getRelease)}

	major=$(echo $version | cut -d. -f1);

	minor=$(echo $version | cut -d. -f2);

	version=$(printf "%d.%d.0" $major $(($minor + 1))) ;

	echo $version

}



function nextMajorLevel() {

	version=${1:-$(getRelease)}

	major=$(echo $version | cut -d. -f1);

	version=$(printf "%d.0.0" $(($major + 1)))

	echo $version

}

.make/Makefile.mk

0 → 100644
+114 −0
Original line number Diff line number Diff line 
#

#   Copyright 2015  Xebia Nederland B.V.

#

#   Licensed under the Apache License, Version 2.0 (the "License");

#   you may not use this file except in compliance with the License.

#   You may obtain a copy of the License at

#

#       http://www.apache.org/licenses/LICENSE-2.0

#

#   Unless required by applicable law or agreed to in writing, software

#   distributed under the License is distributed on an "AS IS" BASIS,

#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

#   See the License for the specific language governing permissions and

#   limitations under the License.

#

NAME=$(shell basename $(CURDIR))



RELEASE_SUPPORT := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))/.make-release-support



ifeq ($(strip $(DOCKER_REGISTRY_HOST)),)

  DOCKER_REGISTRY_HOST = registry.gitlab.com

endif



ifeq ($(strip $(DOCKER_REGISTRY_USER)),)

  DOCKER_REGISTRY_USER = ska-telescope/ska-skeleton

endif



IMAGE=$(DOCKER_REGISTRY_HOST)/$(DOCKER_REGISTRY_USER)/$(NAME)



VERSION=$(shell . $(RELEASE_SUPPORT) ; getVersion)

TAG=$(shell . $(RELEASE_SUPPORT); getTag)



SHELL=/bin/bash



DOCKER_BUILD_CONTEXT=.

DOCKER_FILE_PATH=Dockerfile



.PHONY: pre-build docker-build post-build build release patch-release minor-release major-release tag check-status check-release showver \

	push pre-push do-push post-push



build: pre-build docker-build post-build



pre-build:



post-build:



pre-push:



post-push:



docker-build: .release

	docker build $(DOCKER_BUILD_ARGS) -t $(IMAGE):$(VERSION) $(DOCKER_BUILD_CONTEXT) -f $(DOCKER_FILE_PATH) --build-arg DOCKER_REGISTRY_HOST=$(DOCKER_REGISTRY_HOST) --build-arg DOCKER_REGISTRY_USER=$(DOCKER_REGISTRY_USER)

	@DOCKER_MAJOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f1) ; \

	DOCKER_MINOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f2) ; \

	if [ $$DOCKER_MAJOR -eq 1 ] && [ $$DOCKER_MINOR -lt 10 ] ; then \

		echo docker tag -f $(IMAGE):$(VERSION) $(IMAGE):latest ;\

		docker tag -f $(IMAGE):$(VERSION) $(IMAGE):latest ;\

	else \

		echo docker tag $(IMAGE):$(VERSION) $(IMAGE):latest ;\

		docker tag $(IMAGE):$(VERSION) $(IMAGE):latest ; \

	fi



.release:

	@echo "release=0.0.0" > .release

	@echo "tag=$(NAME)-0.0.0" >> .release

	@echo INFO: .release created

	@cat .release



release: check-status check-release build push



push: pre-push do-push post-push



do-push:

#	docker push $(IMAGE):$(VERSION)

	docker push $(IMAGE):latest



snapshot: build push



showver: .release

	@. $(RELEASE_SUPPORT); getVersion



bump-patch-release: VERSION := $(shell . $(RELEASE_SUPPORT); nextPatchLevel)

bump-patch-release: .release tag



bump-minor-release: VERSION := $(shell . $(RELEASE_SUPPORT); nextMinorLevel)

bump-minor-release: .release tag



bump-major-release: VERSION := $(shell . $(RELEASE_SUPPORT); nextMajorLevel)

bump-major-release: .release tag



patch-release: tag-patch-release release

	@echo $(VERSION)



minor-release: tag-minor-release release

	@echo $(VERSION)



major-release: tag-major-release release

	@echo $(VERSION)



tag: TAG=$(shell . $(RELEASE_SUPPORT); getTag $(VERSION))

tag: check-status

#	@. $(RELEASE_SUPPORT) ; ! tagExists $(TAG) || (echo "ERROR: tag $(TAG) for version $(VERSION) already tagged in git" >&2 && exit 1) ;

	@. $(RELEASE_SUPPORT) ; setRelease $(VERSION)

#	git add .

#	git commit -m "bumped to version $(VERSION)" ;

#	git tag $(TAG) ;

#	@ if [ -n "$(shell git remote -v)" ] ; then git push --tags ; else echo 'no remote to push tags to' ; fi



check-status:

	@. $(RELEASE_SUPPORT) ; ! hasChanges || (echo "ERROR: there are still outstanding changes" >&2 && exit 1) ;



check-release: .release

	@. $(RELEASE_SUPPORT) ; tagExists $(TAG) || (echo "ERROR: version not yet tagged in git. make [minor,major,patch]-release." >&2 && exit 1) ;

	@. $(RELEASE_SUPPORT) ; ! differsFromRelease $(TAG) || (echo "ERROR: current directory differs from tagged $(TAG). make [minor,major,patch]-release." ; exit 1)

.release

0 → 100644
+2 −0
Original line number Diff line number Diff line 
release=0.1.0

tag=ska-telescope-0.1.0