This repository was archived by the owner on May 28, 2021. It is now read-only.
Simplify and improve the local developer experience for pushing images #167
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
prydie
suggested changes
Jul 4, 2018
| SRC_DIRS := cmd pkg test/examples | ||
| REGISTRY_STRING := $(subst /,_,$(REGISTRY)) | ||
| CMD_DIRECTORIES := $(sort $(dir $(wildcard ./cmd/*/))) |
| SRC_DIRS := cmd pkg test/examples | ||
| REGISTRY_STRING := $(subst /,_,$(REGISTRY)) | ||
| CMD_DIRECTORIES := $(sort $(dir $(wildcard ./cmd/*/))) | ||
| COMMANDS := $(CMD_DIRECTORIES:./cmd/%/=%) |
There was a problem hiding this comment.
Still used / referenced. Will remove in a subsequent PR when fixing the build step to keep things clean.
Makefile
Outdated
| CMD_DIRECTORIES := $(sort $(dir $(wildcard ./cmd/*/))) | ||
| COMMANDS := $(CMD_DIRECTORIES:./cmd/%/=%) | ||
| CONTAINER_FILES := $(addprefix .container-$(REGISTRY_STRING)-,$(addsuffix -$(VERSION),$(COMMANDS))) | ||
| PUSH_FILES := $(addprefix .push-$(REGISTRY_STRING)-,$(addsuffix -$(VERSION),$(COMMANDS))) | ||
|
|
||
| ARCH := amd64 |
Makefile
Outdated
| CMD_DIRECTORIES := $(sort $(dir $(wildcard ./cmd/*/))) | ||
| COMMANDS := $(CMD_DIRECTORIES:./cmd/%/=%) | ||
| CONTAINER_FILES := $(addprefix .container-$(REGISTRY_STRING)-,$(addsuffix -$(VERSION),$(COMMANDS))) | ||
| PUSH_FILES := $(addprefix .push-$(REGISTRY_STRING)-,$(addsuffix -$(VERSION),$(COMMANDS))) | ||
|
|
||
| ARCH := amd64 | ||
| OS := linux |
Makefile
Outdated
| TENANT := "spinnaker" | ||
| endif | ||
|
|
||
| ROOT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST)))) | ||
| PKG := github.com/oracle/mysql-operator | ||
| REGISTRY := iad.ocir.io/$(TENANT) | ||
| REGISTRY := iad.ocir.io |
Makefile
Outdated
| @@ -18,19 +18,16 @@ ifdef WERCKER | |||
| TENANT := "oracle" | |||
| else | |||
| NEW_NAMESPACE ?= e2e-${USER} | |||
| VERSION := ${USER}-$(shell date +%Y%m%d%H%M%S) | |||
| VERSION := ${USER}-$(shell git describe --always --dirty) | |||
Makefile
Outdated
| @@ -18,19 +18,16 @@ ifdef WERCKER | |||
| TENANT := "oracle" | |||
| else | |||
| NEW_NAMESPACE ?= e2e-${USER} | |||
Makefile
Outdated
| @@ -18,19 +18,16 @@ ifdef WERCKER | |||
| TENANT := "oracle" | |||
| else | |||
| NEW_NAMESPACE ?= e2e-${USER} | |||
| VERSION := ${USER}-$(shell date +%Y%m%d%H%M%S) | |||
| VERSION := ${USER}-$(shell git describe --always --dirty) | |||
| TENANT := "spinnaker" | |||
|
|
||
| .PHONY: bin-clean | ||
| bin-clean: | ||
| clean: | ||
| rm -rf .go bin |
There was a problem hiding this comment.
No need to rm .go as it's not created any more AFAIK
There was a problem hiding this comment.
Still created on my machine. Will remove after fixing the build process in a subsequent PR.
Makefile
Outdated
| @docker push $(REGISTRY)/$*:$(VERSION) | ||
| @docker images -q $(REGISTRY)/$*:$(VERSION) > $@ | ||
| push: build | ||
| @docker build --build-arg=http_proxy --build-arg=https_proxy -t $(REGISTRY)/$(TENANT)/mysql-operator:$(VERSION) -f docker/mysql-operator/Dockerfile . |
There was a problem hiding this comment.
Would break these up over multiple lines
There was a problem hiding this comment.
Agree. Split into a separate step for hygiene and broken into multiple lines.
prydie
approved these changes
Jul 5, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change makes some simplifications to the Makefile around pushing development images.