Fix 5

.gitlab-ci.yml

@@ -6,7 +6,7 @@ image: gsiupm/dockermake:latest
 variables:
   DOCKER_DRIVER: overlay
   DOCKERFILE: Dockerfile
-  VERSION: $CI_BUILD_REF
+  IMAGENAME: $CI_REGISTRY_IMAGE
 
 stages:
   - test
@@ -43,32 +43,18 @@ push-3.5:
   <<: *image_definition
   variables:
     PYTHON_VERSION: "3.5"
-    VERSION: $CI_BUILD_TAG
-    IMAGENAME: $CI_REGISTRY_IMAGE
 
 push-2.7:
   <<: *image_definition
   variables:
     PYTHON_VERSION: "2.7"
-    VERSION: $CI_BUILD_TAG
-    IMAGENAME: $CI_REGISTRY_IMAGE
-
-push-main:
-  <<: *image_definition
-  variables:
-    PYTHON_VERSION: main
-    VERSION: $CI_BUILD_TAG
-    IMAGENAME: $CI_REGISTRY_IMAGE
 
 push-latest:
   <<: *image_definition
   variables:
     PYTHON_VERSION: latest
-    VERSION: $CI_BUILD_TAG
-    IMAGENAME: $CI_REGISTRY_IMAGE
   only:
     - master
-    - tags
     - triggers
 
 clean :

Makefile

@@ -99,11 +99,9 @@ push-latest: build-$(PYMAIN)
 	docker push '$(IMAGEWTAG)'
 
 push-%: build-%
-	docker push $(IMAGE):$(VERSION)-python$*
-
-push-main: push-$(PYMAIN)
+	docker push $(IMAGENAME):$(VERSION)-python$*
 
 ci:
 	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