diff --git a/.travis.yml b/.travis.yml index 7c221fff..118532b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/CHANGES.md b/CHANGES.md index 3f9dd0f9..4415bfbb 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -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)) @@ -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 diff --git a/Makefile b/Makefile index 21480966..b9305541 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/scripts/dev/travis-docker-push b/scripts/dev/travis-docker-push deleted file mode 100755 index 56d86bdf..00000000 --- a/scripts/dev/travis-docker-push +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash -# Travis Deploy Docker Push -set -e - -docker info -GOOS=linux make build -make docker-image -docker login -u="$DOCKER_USERNAME" -p=$DOCKER_PASSWORD quay.io -make docker-push -