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

Rename docker organization and registry variables in Makefile

This commit is contained in:
Tomasz Sęk 2019-02-17 23:53:08 +01:00
parent 1ad5992160
commit e31e493386
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

22
Makefile
View File

@ -147,12 +147,12 @@ test: ## Runs the go tests
CURRENT_DIRECTORY := $(shell pwd) CURRENT_DIRECTORY := $(shell pwd)
e2e: build docker-build ## Runs e2e tests, you can use EXTRA_ARGS e2e: build docker-build ## Runs e2e tests, you can use EXTRA_ARGS
@echo "+ $@" @echo "+ $@"
@echo "Docker image: $(REPO):$(GITCOMMIT)" @echo "Docker image: $(DOCKER_REGISTRY):$(GITCOMMIT)"
cp deploy/service_account.yaml deploy/namespace-init.yaml cp deploy/service_account.yaml deploy/namespace-init.yaml
cat deploy/role.yaml >> deploy/namespace-init.yaml cat deploy/role.yaml >> deploy/namespace-init.yaml
cat deploy/role_binding.yaml >> deploy/namespace-init.yaml cat deploy/role_binding.yaml >> deploy/namespace-init.yaml
cat deploy/operator.yaml >> deploy/namespace-init.yaml cat deploy/operator.yaml >> deploy/namespace-init.yaml
sed -i 's|\(image:\).*|\1 $(REPO):$(GITCOMMIT)|g' deploy/namespace-init.yaml sed -i 's|\(image:\).*|\1 $(DOCKER_REGISTRY):$(GITCOMMIT)|g' deploy/namespace-init.yaml
ifeq ($(ENVIRONMENT),minikube) ifeq ($(ENVIRONMENT),minikube)
sed -i 's|\(imagePullPolicy\): IfNotPresent|\1: Never|g' deploy/namespace-init.yaml sed -i 's|\(imagePullPolicy\): IfNotPresent|\1: Never|g' deploy/namespace-init.yaml
sed -i 's|\(args:\).*|\1\ ["--minikube"\]|' deploy/namespace-init.yaml sed -i 's|\(args:\).*|\1\ ["--minikube"\]|' deploy/namespace-init.yaml
@ -255,9 +255,9 @@ docker-login: ## Log in into the Docker repository
@echo "+ $@" @echo "+ $@"
.PHONY: docker-build .PHONY: docker-build
docker-build: check-env ## Build the container docker-build: check-env build ## Build the container
@echo "+ $@" @echo "+ $@"
docker build . -t $(REPO):$(GITCOMMIT) --file build/Dockerfile docker build . -t $(DOCKER_REGISTRY):$(GITCOMMIT) --file build/Dockerfile
.PHONY: docker-images .PHONY: docker-images
docker-images: ## List all local containers docker-images: ## List all local containers
@ -267,20 +267,20 @@ docker-images: ## List all local containers
.PHONY: docker-push .PHONY: docker-push
docker-push: ## Push the container docker-push: ## Push the container
@echo "+ $@" @echo "+ $@"
docker tag $(REPO):$(GITCOMMIT) $(DOCKER_REGISTRY)/$(REPO):$(BUILD_TAG) docker tag $(DOCKER_REGISTRY):$(GITCOMMIT) $(DOCKER_ORGANIZATION)/$(DOCKER_REGISTRY):$(BUILD_TAG)
docker push $(DOCKER_REGISTRY)/$(REPO):$(BUILD_TAG) docker push $(DOCKER_ORGANIZATION)/$(DOCKER_REGISTRY):$(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: ## Release image with version tag (in addition to build tag)
@echo "+ $@" @echo "+ $@"
docker tag $(REPO):$(GITCOMMIT) $(DOCKER_REGISTRY)/$(REPO):$(VERSION_TAG) docker tag $(DOCKER_REGISTRY):$(GITCOMMIT) $(DOCKER_ORGANIZATION)/$(DOCKER_REGISTRY):$(VERSION_TAG)
docker push $(DOCKER_REGISTRY)/$(REPO):$(VERSION_TAG) docker push $(DOCKER_ORGANIZATION)/$(DOCKER_REGISTRY):$(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: ## Release image with latest tags (in addition to build tag)
@echo "+ $@" @echo "+ $@"
docker tag $(REPO):$(GITCOMMIT) $(DOCKER_REGISTRY)/$(REPO):$(LATEST_TAG) docker tag $(DOCKER_REGISTRY):$(GITCOMMIT) $(DOCKER_ORGANIZATION)/$(DOCKER_REGISTRY):$(LATEST_TAG)
docker push $(DOCKER_REGISTRY)/$(REPO):$(LATEST_TAG) docker push $(DOCKER_ORGANIZATION)/$(DOCKER_REGISTRY):$(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)
@ -299,7 +299,7 @@ docker-run: ## Run the container in docker, you can use EXTRA_ARGS
@echo "+ $@" @echo "+ $@"
docker run --rm -i $(DOCKER_FLAGS) \ docker run --rm -i $(DOCKER_FLAGS) \
--volume $(HOME)/.kube/config:/home/jenkins-operator/.kube/config \ --volume $(HOME)/.kube/config:/home/jenkins-operator/.kube/config \
$(REPO):$(GITCOMMIT) $(ARGS) $(DOCKER_REGISTRY):$(GITCOMMIT) $(ARGS)
.PHONY: minikube-run .PHONY: minikube-run
minikube-run: export WATCH_NAMESPACE = $(NAMESPACE) minikube-run: export WATCH_NAMESPACE = $(NAMESPACE)

4
config.env
View File

@ -1,8 +1,8 @@
# Setup variables for the Makefile # Setup variables for the Makefile
NAME=kubernetes-operator NAME=kubernetes-operator
PKG=github.com/jenkinsci/kubernetes-operator PKG=github.com/jenkinsci/kubernetes-operator
DOCKER_REGISTRY=virtuslab DOCKER_ORGANIZATION=virtuslab
REPO=kubernetes-operator DOCKER_REGISTRY=jenkins-operator
NAMESPACE=default NAMESPACE=default
API_VERSION=jenkins:v1alpha1 API_VERSION=jenkins:v1alpha1
MINIKUBE_KUBERNETES_VERSION=v1.10.9 MINIKUBE_KUBERNETES_VERSION=v1.10.9