public_git
/
kubernetes-operator
mirror of https://github.com/jenkinsci/kubernetes-operator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

#4 Improve backup PVC Makefile

This commit is contained in:
Tomasz Sęk 2019-06-17 23:11:22 +02:00
parent a408112875
commit 83f413dfe0
No known key found for this signature in database
GPG Key ID: DC356D23F6A644D0
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
backup/pvc/Makefile
View File

@ -67,7 +67,7 @@ endif
define e2e define e2e
echo "\nRunning $(1) e2e test"; echo "\nRunning $(1) e2e test";
@e2e/$(1)/test.sh $(DOCKER_REGISTRY)/$(NAME):$(GITCOMMIT); @e2e/$(1)/test.sh $(DOCKER_REGISTRY)-$(NAME):$(GITCOMMIT);
endef endef
.PHONY: docker-e2e .PHONY: docker-e2e
@ -83,7 +83,7 @@ docker-login: ## Log in into the Docker repository
.PHONY: docker-build .PHONY: docker-build
docker-build: check-env ## Build the container docker-build: check-env ## Build the container
@echo "+ $@" @echo "+ $@"
docker build . -t $(DOCKER_REGISTRY)/$(NAME):$(GITCOMMIT) --file Dockerfile docker build . -t $(DOCKER_REGISTRY)-$(NAME):$(GITCOMMIT) --file Dockerfile
.PHONY: docker-images .PHONY: docker-images
docker-images: ## List all local containers docker-images: ## List all local containers
@ -91,22 +91,22 @@ docker-images: ## List all local containers
docker images docker images
.PHONY: docker-push .PHONY: docker-push
docker-push: ## Push the container docker-push: docker-build ## Push the container
@echo "+ $@" @echo "+ $@"
docker tag $(DOCKER_REGISTRY)/$(NAME):$(GITCOMMIT) $(DOCKER_ORGANIZATION)/$(DOCKER_REGISTRY)/$(NAME):$(BUILD_TAG) docker tag $(DOCKER_REGISTRY)-$(NAME):$(GITCOMMIT) $(DOCKER_ORGANIZATION)/$(DOCKER_REGISTRY)-$(NAME):$(BUILD_TAG)
docker push $(DOCKER_ORGANIZATION)/$(DOCKER_REGISTRY)/$(NAME):$(BUILD_TAG) docker push $(DOCKER_ORGANIZATION)/$(DOCKER_REGISTRY)-$(NAME):$(BUILD_TAG)
.PHONY: docker-release-version .PHONY: docker-release-version
docker-release-version: ## Release image with version tag (in addition to build tag) docker-release-version: docker-build ## Release image with version tag (in addition to build tag)
@echo "+ $@" @echo "+ $@"
docker tag $(DOCKER_REGISTRY)/$(NAME):$(GITCOMMIT) $(DOCKER_ORGANIZATION)/$(DOCKER_REGISTRY)/$(NAME):$(VERSION_TAG) docker tag $(DOCKER_REGISTRY)-$(NAME):$(GITCOMMIT) $(DOCKER_ORGANIZATION)/$(DOCKER_REGISTRY)-$(NAME):$(VERSION_TAG)
docker push $(DOCKER_ORGANIZATION)/$(DOCKER_REGISTRY)/$(NAME):$(VERSION_TAG) docker push $(DOCKER_ORGANIZATION)/$(DOCKER_REGISTRY)-$(NAME):$(VERSION_TAG)
.PHONY: docker-release-latest .PHONY: docker-release-latest
docker-release-latest: ## Release image with latest tags (in addition to build tag) docker-release-latest: docker-build ## Release image with latest tags (in addition to build tag)
@echo "+ $@" @echo "+ $@"
docker tag $(DOCKER_REGISTRY)/$(NAME):$(GITCOMMIT) $(DOCKER_ORGANIZATION)/$(DOCKER_REGISTRY)/$(NAME):$(LATEST_TAG) docker tag $(DOCKER_REGISTRY)-$(NAME):$(GITCOMMIT) $(DOCKER_ORGANIZATION)/$(DOCKER_REGISTRY)-$(NAME):$(LATEST_TAG)
docker push $(DOCKER_ORGANIZATION)/$(DOCKER_REGISTRY)/$(NAME):$(LATEST_TAG) docker push $(DOCKER_ORGANIZATION)/$(DOCKER_REGISTRY)-$(NAME):$(LATEST_TAG)
.PHONY: docker-release .PHONY: docker-release
docker-release: docker-release-version docker-release-latest ## Release image with version and latest tags (in addition to build tag) docker-release: docker-release-version docker-release-latest ## Release image with version and latest tags (in addition to build tag)
@ -124,7 +124,7 @@ endif
docker-run: docker-build ## Run the container in docker, you can use EXTRA_ARGS docker-run: docker-build ## Run the container in docker, you can use EXTRA_ARGS
@echo "+ $@" @echo "+ $@"
docker run --rm -i $(DOCKER_FLAGS) \ docker run --rm -i $(DOCKER_FLAGS) \
$(DOCKER_REGISTRY)/$(NAME):$(GITCOMMIT) $(ARGS) $(DOCKER_REGISTRY)-$(NAME):$(GITCOMMIT) $(ARGS)
.PHONY: bump-version .PHONY: bump-version
BUMP := patch BUMP := patch

2
backup/pvc/config.env
View File

@ -1,4 +1,4 @@
# Setup variables for the Makefile # Setup variables for the Makefile
NAME=pvc NAME=pvc
DOCKER_ORGANIZATION=virtuslab DOCKER_ORGANIZATION=virtuslab
DOCKER_REGISTRY=jenkins-operator/backup DOCKER_REGISTRY=jenkins-operator-backup