balkian/senpy
1
0
Fork 0
mirror of https://github.com/gsi-upm/senpy synced 2024-11-22 08:12:27 +00:00
Code Issues Releases Wiki Activity

Fixed IMAGE names in GL CI

Browse Source
This commit is contained in:
J. Fernando Sánchez 2017-02-27 20:00:09 +01:00
parent 15d456d048
commit c72094b94b
2 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.gitlab-ci.yml
View File

@ -10,8 +10,7 @@ variables:
stages: stages:
- test - test
- images - push
- release
- clean - clean
.test: &test_definition .test: &test_definition
@ -31,7 +30,7 @@ test-2.7:
.image: &image_definition .image: &image_definition
stage: images stage: push
before_script: before_script:
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
script: script:
@ -41,22 +40,22 @@ test-2.7:
- master - master
- triggers - triggers
image-3.5: push-3.5:
<<: *image_definition <<: *image_definition
variables: variables:
PYTHON_VERSION: "3.5" PYTHON_VERSION: "3.5"
VERSION: $CI_BUILD_TAG VERSION: $CI_BUILD_TAG
IMAGENAME: $CI_REGISTRY_IMAGE IMAGENAME: $CI_REGISTRY_IMAGE
image-2.7: push-2.7:
<<: *image_definition <<: *image_definition
variables: variables:
PYTHON_VERSION: "2.7" PYTHON_VERSION: "2.7"
VERSION: $CI_BUILD_TAG VERSION: $CI_BUILD_TAG
IMAGENAME: $CI_REGISTRY_IMAGE IMAGENAME: $CI_REGISTRY_IMAGE
image-latest: push-latest:
stage: release stage: push
variables: variables:
IMAGENAME: $CI_REGISTRY_IMAGE IMAGENAME: $CI_REGISTRY_IMAGE
before_script: before_script:

28
Makefile
View File

@ -4,7 +4,8 @@ NAME=senpy
REPO=gsiupm REPO=gsiupm
VERSION=$(shell git describe --tags --dirty 2>/dev/null) VERSION=$(shell git describe --tags --dirty 2>/dev/null)
TARNAME=$(NAME)-$(VERSION).tar.gz TARNAME=$(NAME)-$(VERSION).tar.gz
IMAGENAME=$(REPO)/$(NAME):$(VERSION) IMAGENAME=$(REPO)/$(NAME)
IMAGEWTAG=$(IMAGENAME):$(VERSION)
action="test-${PYMAIN}" action="test-${PYMAIN}"
all: build run all: build run
@ -35,14 +36,14 @@ quick_build: $(addprefix build-, $(PYMAIN))
build: $(addprefix build-, $(PYVERSIONS)) build: $(addprefix build-, $(PYVERSIONS))
build-%: version Dockerfile-% build-%: version Dockerfile-%
docker build -t '$(IMAGENAME)-python$*' -f Dockerfile-$* .; docker build -t '$(IMAGEWTAG)-python$*' -f Dockerfile-$* .;
quick_test: $(addprefix test-,$(PYMAIN)) quick_test: $(addprefix test-,$(PYMAIN))
dev-%: dev-%:
@docker start $(NAME)-dev || (\ @docker start $(NAME)-dev || (\
$(MAKE) build-$*; \ $(MAKE) build-$*; \
docker run -d -w /usr/src/app/ -v $$PWD:/usr/src/app --entrypoint=/bin/bash -p 5000:5000 -ti --name $(NAME)-dev '$(IMAGENAME)-python$*'; \ docker run -d -w /usr/src/app/ -v $$PWD:/usr/src/app --entrypoint=/bin/bash -p 5000:5000 -ti --name $(NAME)-dev '$(IMAGEWTAG)-python$*'; \
)\ )\
docker exec -ti $(NAME)-dev bash docker exec -ti $(NAME)-dev bash
@ -52,7 +53,7 @@ dev: dev-$(PYMAIN)
test-all: $(addprefix test-,$(PYVERSIONS)) test-all: $(addprefix test-,$(PYVERSIONS))
test-%: build-% test-%: build-%
docker run --rm --entrypoint /usr/local/bin/python -w /usr/src/app $(IMAGENAME)-python$* setup.py test docker run --rm --entrypoint /usr/local/bin/python -w /usr/src/app $(IMAGEWTAG)-python$* setup.py test
test: test-$(PYMAIN) test: test-$(PYMAIN)
@ -66,15 +67,6 @@ pip_test-%: sdist
pip_test: $(addprefix pip_test-,$(PYVERSIONS)) pip_test: $(addprefix pip_test-,$(PYVERSIONS))
upload-%: test-%
docker push '$(IMAGENAME)-python$*'
upload: test $(addprefix upload-,$(PYVERSIONS))
docker tag '$(IMAGENAME)-python$(PYMAIN)' '$(IMAGENAME)'
docker tag '$(IMAGENAME)-python$(PYMAIN)' '$(REPO)/$(NAME)'
docker push '$(IMAGENAME)'
docker push '$(REPO)/$(NAME)'
clean: clean:
@docker ps -a | awk '/$(REPO)\/$(NAME)/{ split($$2, vers, "-"); if(vers[0] != "${VERSION}"){ print $$1;}}' | xargs docker rm -v 2>/dev/null|| true @docker ps -a | awk '/$(REPO)\/$(NAME)/{ split($$2, vers, "-"); if(vers[0] != "${VERSION}"){ print $$1;}}' | xargs docker rm -v 2>/dev/null|| true
@docker images | awk '/$(REPO)\/$(NAME)/{ split($$2, vers, "-"); if(vers[0] != "${VERSION}"){ print $$1":"$$2;}}' | xargs docker rmi 2>/dev/null|| true @docker images | awk '/$(REPO)\/$(NAME)/{ split($$2, vers, "-"); if(vers[0] != "${VERSION}"){ print $$1":"$$2;}}' | xargs docker rmi 2>/dev/null|| true
@ -96,16 +88,18 @@ pip_upload:
pip_test: $(addprefix pip_test-,$(PYVERSIONS)) pip_test: $(addprefix pip_test-,$(PYVERSIONS))
run-%: build-% run-%: build-%
docker run --rm -p 5000:5000 -ti '$(IMAGENAME)-python$(PYMAIN)' --default-plugins docker run --rm -p 5000:5000 -ti '$(IMAGEWTAG)-python$(PYMAIN)' --default-plugins
run: run-$(PYMAIN) run: run-$(PYMAIN)
push-latest: build-$(PYMAIN) push-latest: build-$(PYMAIN)
docker tag $(IMAGENAME)-python$(PYMAIN) $(IMAGENAME) docker tag '$(IMAGEWTAG)-python$(PYMAIN)' '$(IMAGEWTAG)'
docker push $(IMAGENAME) docker tag '$(IMAGEWTAG)-python$(PYMAIN)' '$(IMAGENAME)'
docker push '$(IMAGENAME)'
docker push '$(IMAGEWTAG)'
push-%: build-% push-%: build-%
docker push $(IMAGENAME)-python$* docker push $(IMAGEWTAG)-python$*
ci: ci:
gitlab-runner exec docker --docker-volumes /var/run/docker.sock:/var/run/docker.sock --env CI_PROJECT_NAME=$(NAME) ${action} gitlab-runner exec docker --docker-volumes /var/run/docker.sock:/var/run/docker.sock --env CI_PROJECT_NAME=$(NAME) ${action}