Commit bd984a14 authored by J. Fernando Sánchez's avatar J. Fernando Sánchez
Browse files

Fix 5

parent e741b565
...@@ -6,7 +6,6 @@ image: gsiupm/dockermake:latest ...@@ -6,7 +6,6 @@ image: gsiupm/dockermake:latest
variables: variables:
DOCKER_DRIVER: overlay DOCKER_DRIVER: overlay
DOCKERFILE: Dockerfile DOCKERFILE: Dockerfile
VERSION: $CI_BUILD_REF
IMAGENAME: $CI_REGISTRY_IMAGE IMAGENAME: $CI_REGISTRY_IMAGE
stages: stages:
...@@ -44,28 +43,18 @@ push-3.5: ...@@ -44,28 +43,18 @@ push-3.5:
<<: *image_definition <<: *image_definition
variables: variables:
PYTHON_VERSION: "3.5" PYTHON_VERSION: "3.5"
VERSION: $CI_BUILD_TAG
push-2.7: push-2.7:
<<: *image_definition <<: *image_definition
variables: variables:
PYTHON_VERSION: "2.7" PYTHON_VERSION: "2.7"
VERSION: $CI_BUILD_TAG
push-main:
<<: *image_definition
variables:
PYTHON_VERSION: main
VERSION: $CI_BUILD_TAG
push-latest: push-latest:
<<: *image_definition <<: *image_definition
variables: variables:
PYTHON_VERSION: latest PYTHON_VERSION: latest
VERSION: $CI_BUILD_TAG
only: only:
- master - master
- tags
- triggers - triggers
clean : clean :
......
...@@ -98,12 +98,10 @@ push-latest: build-$(PYMAIN) ...@@ -98,12 +98,10 @@ push-latest: build-$(PYMAIN)
docker push '$(IMAGENAME)' docker push '$(IMAGENAME)'
docker push '$(IMAGEWTAG)' docker push '$(IMAGEWTAG)'
push-main: push-$(PYMAIN)
push-%: build-% push-%: build-%
docker push $(IMAGENAME):$(VERSION)-python$* docker push $(IMAGENAME):$(VERSION)-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}
.PHONY: test test-% test-all build-% build test pip_test run yapf dev ci version .FORCE .PHONY: test test-% test-all build-% build test pip_test run yapf push-main push-% dev ci version .FORCE
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment