Commit e467309d authored by Alberto Pascual's avatar Alberto Pascual
Browse files

deployment fixes

parent 660d3466
Pipeline #427 passed with stages
in 4 minutes and 30 seconds
......@@ -23,12 +23,12 @@ push-web:
.image: &image_definition
stage: push
script:
- make -e push-luigi
- make -e push-latest
only:
- tags
- triggers
push-luigi:
push-latest:
<<: *image_definition
only:
- tags
......
......@@ -79,18 +79,6 @@ push-latest: $(addprefix push-latest-,$(PYVERSIONS)) ## Push the "latest" tag to
docker push '$(IMAGENAME):latest'
docker push '$(IMAGEWTAG)'
push-web: $(addprefix push-latest-,$(PYVERSIONS)) ## Push the "latest" tag to dockerhub
docker tag '$(IMAGEWTAG)-python$(PYMAIN)' '$(IMAGEWTAG)'
docker tag '$(IMAGEWTAG)-python$(PYMAIN)' '$(IMAGENAMEWEB)'
docker push '$(IMAGENAMEWEB):latest'
docker push '$(IMAGEWTAG)'
push-luigi: $(addprefix push-latest-,$(PYVERSIONS)) ## Push the "latest" tag to dockerhub
docker tag '$(IMAGEWTAG)-python$(PYMAIN)' '$(IMAGEWTAG)'
docker tag '$(IMAGEWTAG)-python$(PYMAIN)' '$(IMAGENAMECRAWLER)'
docker push '$(IMAGENAMECRAWLER):latest'
docker push '$(IMAGEWTAG)'
push-latest-%: build-% ## Push the latest image for a specific python version
docker tag $(IMAGENAME):$(VERSION)-python$* $(IMAGENAME):python$*
docker push $(IMAGENAME):$(VERSION)-python$*
......
NAME:=dashboard-somedi
IMAGENAMEWEB:=registry.cluster.gsi.dit.upm.es/sefarad/dashboard-somedi/web
IMAGENAMECRAWLER:=registry.cluster.gsi.dit.upm.es/sefarad/dashboard-somedi/gsicrawler
IMAGENAME:=registry.cluster.gsi.dit.upm.es/sefarad/dashboard-somedi/gsicrawler
VERSIONFILE:=VERSION
include .makefiles/base.mk
include .makefiles/python.mk
include .makefiles/k8s.mk
build-web: version Dockerfile-% ## Build a specific version (e.g. build-2.7)
docker build -t '$(IMAGEWTAG)-python$*' --cache-from $(IMAGENAMEWEB):python$* -f demo/Dockerfile-$* .;
push-web: $(addprefix push-latest-,$(PYVERSIONS)) ## Push the "latest" tag to dockerhub
docker tag '$(IMAGEWTAG)-python$(PYMAIN)' '$(IMAGEWTAG)'
docker tag '$(IMAGEWTAG)-python$(PYMAIN)' '$(IMAGENAMEWEB)'
docker push '$(IMAGENAMEWEB):latest'
docker push '$(IMAGEWTAG)'
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