Skip to content

Commit

Permalink
Change Matchbox container image publishing
Browse files Browse the repository at this point in the history
* Use our own infra to perform image builds and push images.
Provides future options for publishing images to multiple
image registries and for multiple architectures, while keeping
push permissions in-house
* Remove Travis ability to push to Quay
* Use Travis only for Go tests of Pull Requests
  • Loading branch information
dghubble committed May 31, 2020
1 parent ec1baf0 commit d007c64
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 31 deletions.
6 changes: 0 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@ install:
script:
- make
deploy:
- provider: script
script: scripts/dev/travis-docker-push
skip_cleanup: true
on:
branch: master
go: '1.13.4'
- provider: script
script: contrib/dnsmasq/travis-deploy
skip_cleanup: true
Expand Down
6 changes: 5 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ Notable changes between releases.

## Latest

* Update Matchbox container image publishing ([#795](https://github.com/poseidon/matchbox/pull/795))
* Publish Matchbox images from internal infra to Quay (`quay.io/poseidon/matchbox`)
* Update Go version from v1.13.4 to v1.13.11

## v0.8.3

* Publish docs to [https://matchbox.psdn.io](https://matchbox.psdn.io/) ([#769](https://github.com/poseidon/matchbox/pull/769))
Expand Down Expand Up @@ -97,7 +101,7 @@ Note: Release signing key [has changed](https://github.com/poseidon/matchbox/blo
* Use etcd3 by default in all clusters (remove etcd2 clusters)
* Add Terraform examples for etcd3 and self-hosted Kubernetes 1.6.1

## v0.5.0 (2017-01-23)
## v0.5.0 (2017-01-23)

* Rename project to CoreOS `matchbox`!
* Add Profile `args` field to list kernel args
Expand Down
14 changes: 0 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,6 @@ push:
@buildah push docker://$(IMAGE_REPO):$(VERSION)
@buildah push docker://$(IMAGE_REPO):latest

# for travis only

.PHONY: docker-image
docker-image:
@sudo docker build --rm=true -t $(LOCAL_REPO):$(VERSION) .
@sudo docker tag $(LOCAL_REPO):$(VERSION) $(LOCAL_REPO):latest

.PHONY: docker-push
docker-push: docker-image
@sudo docker tag $(LOCAL_REPO):$(VERSION) $(IMAGE_REPO):latest
@sudo docker tag $(LOCAL_REPO):$(VERSION) $(IMAGE_REPO):$(VERSION)
@sudo docker push $(IMAGE_REPO):latest
@sudo docker push $(IMAGE_REPO):$(VERSION)

.PHONY: update
update:
@GOFLAGS="" go get -u
Expand Down
10 changes: 0 additions & 10 deletions scripts/dev/travis-docker-push

This file was deleted.

0 comments on commit d007c64

Please sign in to comment.