kubernetes
/
examples
mirror of https://github.com/kubernetes/examples.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build and push manifests for container images 

We build and push images for various architectures, but are not
publishing a single manifest that can be used to look up the images.
test/images in main k/k repository and kube images in k/release already
publish manifests for all the image we need for e2e testing, so we
should do the same as the 2 images in this repository are part of the
conformance e2e test suite.

Bumping version numbers as well.

Change-Id: I5f87af9e5ad15da86b9e99bcb7a60a81870d0836
This commit is contained in:
Davanum Srinivas 2018-08-02 16:39:22 -04:00
parent c4ca96d76f
commit dc35258e19
No known key found for this signature in database
GPG Key ID: 80D83A796103BF59
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
guestbook/php-redis/Makefile
View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
TAG = v5 TAG = v6
REGISTRY = gcr.io/google-samples REGISTRY = gcr.io/google-samples
ARCH ?= $(shell go env GOARCH) ARCH ?= $(shell go env GOARCH)
ALL_ARCH = amd64 arm arm64 ppc64le ALL_ARCH = amd64 arm arm64 ppc64le
@ -49,7 +49,9 @@ sub-push-%:
all-container: $(addprefix sub-container-,$(ALL_ARCH)) all-container: $(addprefix sub-container-,$(ALL_ARCH))
all-push: $(addprefix sub-push-,$(ALL_ARCH)) all-push: $(addprefix sub-push-,$(ALL_ARCH))
docker manifest create --amend $(IMAGE):$(TAG) $(shell echo $(ALL_ARCH) | sed -e "s~[^ ]*~$(IMAGE)\-&:$(TAG)~g")
@for arch in $(ALL_ARCH); do echo docker manifest annotate --arch $${arch} ${IMAGE}:${TAG} ${IMAGE}-$${arch}:${TAG}; done
docker manifest push ${IMAGE}:${TAG}
container: .container-$(ARCH) container: .container-$(ARCH)
.container-$(ARCH): .container-$(ARCH):
@ -70,10 +72,7 @@ endif
push: .push-$(ARCH) push: .push-$(ARCH)
.push-$(ARCH): .container-$(ARCH) .push-$(ARCH): .container-$(ARCH)
gcloud docker -- push $(MULTI_ARCH_IMG):$(TAG) docker push $(IMAGE):$(TAG)
ifeq ($(ARCH), amd64)
gcloud docker -- push $(IMAGE):$(TAG)
endif
clean: $(addprefix sub-clean-,$(ALL_ARCH)) clean: $(addprefix sub-clean-,$(ALL_ARCH))
docker rmi -f $(IMAGE):$(TAG) || true docker rmi -f $(IMAGE):$(TAG) || true

10
guestbook/redis-slave/Makefile
View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
TAG = v2 TAG = v3
REGISTRY = gcr.io/google-samples REGISTRY = gcr.io/google-samples
ARCH ?= $(shell go env GOARCH) ARCH ?= $(shell go env GOARCH)
ALL_ARCH = amd64 arm arm64 ppc64le ALL_ARCH = amd64 arm arm64 ppc64le
@ -47,6 +47,9 @@ sub-push-%:
all-container: $(addprefix sub-container-,$(ALL_ARCH)) all-container: $(addprefix sub-container-,$(ALL_ARCH))
all-push: $(addprefix sub-push-,$(ALL_ARCH)) all-push: $(addprefix sub-push-,$(ALL_ARCH))
docker manifest create --amend $(IMAGE):$(TAG) $(shell echo $(ALL_ARCH) | sed -e "s~[^ ]*~$(IMAGE)\-&:$(TAG)~g")
@for arch in $(ALL_ARCH); do echo docker manifest annotate --arch $${arch} ${IMAGE}:${TAG} ${IMAGE}-$${arch}:${TAG}; done
docker manifest push ${IMAGE}:${TAG}
container: .container-$(ARCH) container: .container-$(ARCH)
.container-$(ARCH): .container-$(ARCH):
@ -65,10 +68,7 @@ endif
push: .push-$(ARCH) push: .push-$(ARCH)
.push-$(ARCH): .container-$(ARCH) .push-$(ARCH): .container-$(ARCH)
gcloud docker -- push $(MULTI_ARCH_IMG):$(TAG) docker push $(IMAGE):$(TAG)
ifeq ($(ARCH), amd64)
gcloud docker -- push $(IMAGE):$(TAG)
endif
clean: $(addprefix sub-clean-,$(ALL_ARCH)) clean: $(addprefix sub-clean-,$(ALL_ARCH))
docker rmi -f $(IMAGE):$(TAG) || true docker rmi -f $(IMAGE):$(TAG) || true