diff --git a/CHANGES.md b/CHANGES.md index ee24831d..10c0e8d8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,6 +10,7 @@ Notable changes between releases. * Update base image from `alpine:3.10` to `alpine:3.12` ([#784](https://github.com/poseidon/matchbox/pull/784)) * Update Kubernetes manifests ([#791](https://github.com/poseidon/matchbox/pull/791)) * Include `contrib/k8s` in release tarballs ([#788](https://github.com/poseidon/matchbox/pull/788)) +* Remove RPM spec file (Copr publishing stopped in v0.6) ## v0.8.3 diff --git a/contrib/rpm/matchbox.spec b/contrib/rpm/matchbox.spec deleted file mode 100644 index eb1dcb5d..00000000 --- a/contrib/rpm/matchbox.spec +++ /dev/null @@ -1,86 +0,0 @@ -%global import_path github.com/coreos/matchbox -%global repo matchbox -%global debug_package %{nil} - -Name: matchbox -Version: 0.6.0 -Release: 2%{?dist} -Summary: Network boot and provision CoreOS machines -License: ASL 2.0 -URL: https://%{import_path} -Source0: https://%{import_path}/archive/v%{version}/%{name}-%{version}.tar.gz - - -BuildRequires: golang -BuildRequires: systemd -%{?systemd_requires} - -Requires(pre): shadow-utils - -%description -matchbox is a service that matches machines to profiles to PXE boot and provision -clusters. Profiles specify the kernel/initrd, kernel args, iPXE config, GRUB -config, Container Linux config, Cloud-config, or other configs. matchbox provides -a read-only HTTP API for machines and an authenticated gRPC API for clients. - -# Limit to architectures supported by golang or gcc-go compilers -ExclusiveArch: %{go_arches} -# Use golang or gcc-go compiler depending on architecture -BuildRequires: compiler(golang) - -%prep -%setup -q -n %{repo}-%{version} - -%build -# create a Go workspace with a symlink to builddir source -mkdir -p src/github.com/coreos -ln -s ../../../ src/github.com/coreos/matchbox -export GOPATH=$(pwd):%{gopath} -export GO15VENDOREXPERIMENT=1 -function gobuild { go build -a -ldflags "-w -X github.com/coreos/matchbox/matchbox/version.Version=v%{version}" "$@"; } -gobuild -o bin/matchbox %{import_path}/cmd/matchbox - -%install -install -d %{buildroot}/%{_bindir} -install -d %{buildroot}%{_sharedstatedir}/%{name} -install -p -m 0755 bin/matchbox %{buildroot}/%{_bindir} -# systemd service unit -mkdir -p %{buildroot}%{_unitdir} -cp contrib/systemd/%{name}.service %{buildroot}%{_unitdir}/ - -%files -%doc README.md CHANGES.md CONTRIBUTING.md LICENSE NOTICE DCO -%{_bindir}/matchbox -%{_sharedstatedir}/%{name} -%{_unitdir}/%{name}.service - -%pre -getent group matchbox >/dev/null || groupadd -r matchbox -getent passwd matchbox >/dev/null || \ - useradd -r -g matchbox -s /sbin/nologin matchbox - -%post -%systemd_post matchbox.service - -%preun -%systemd_preun matchbox.service - -%postun -%systemd_postun_with_restart matchbox.service - -%changelog -* Mon Apr 24 2017 - 0.6.0-1 -- New support for terraform-provider-matchbox plugin -- Add ProfileDelete, GroupDelete, IgnitionGet and IgnitionDelete gRPC endpoints -- Generate code with gRPC v1.2.1 and matching Go protoc-gen-go plugin -- Update Ignition to v0.14.0 and coreos-cloudinit to v1.13.0 -- New documentation at https://coreos.com/matchbox/docs/latest -* Wed Jan 25 2017 - 0.5.0-1 -- Rename project from bootcfg to matchbox -* Sat Dec 3 2016 - 0.4.1-3 -- Add missing ldflags which caused bootcfg -version to report wrong version -* Fri Dec 2 2016 - 0.4.1-2 -- Fix bootcfg user creation -* Fri Dec 2 2016 - 0.4.1-1 -- Initial package - diff --git a/docs/deployment.md b/docs/deployment.md index 6ac96744..0c9dc880 100644 --- a/docs/deployment.md +++ b/docs/deployment.md @@ -1,6 +1,6 @@ # Installation -This guide walks through deploying the `matchbox` service on a Linux host (via RPM, docker, or binary) or on a Kubernetes cluster. +This guide walks through deploying the `matchbox` service on a Linux host (as a binary or container image) or on a Kubernetes cluster. ## Provisoner @@ -9,7 +9,6 @@ This guide walks through deploying the `matchbox` service on a Linux host (via R Choose one of the supported installation options: * [CoreOS Container Linux](#coreos-container-linux) -* [RPM-based](#rpm-based-distro) * [Generic Linux (binary)](#generic-linux) * [With docker](#docker) * [Kubernetes Service](#kubernetes) @@ -40,17 +39,6 @@ $ cd matchbox-v0.8.3-linux-amd64 ## Install -### RPM-based distro - -On an RPM-based provisioner (Fedora 24+), install the `matchbox` RPM from the Copr [repository](https://copr.fedorainfracloud.org/coprs/g/CoreOS/matchbox/) using `dnf`. - -```sh -dnf copr enable @CoreOS/matchbox -dnf install matchbox -``` - -RPMs are not currently available for CentOS and RHEL (due to Go version). CentOS and RHEL users should follow the Generic Linux section below. - ### Generic Linux Pre-built binaries are available for generic Linux distributions. Copy the `matchbox` static binary to an appropriate location on the host. @@ -245,9 +233,9 @@ Review [network setup](https://github.com/poseidon/matchbox/blob/master/docs/net Poseidon provides [dnsmasq](https://github.com/poseidon/matchbox/tree/master/contrib/dnsmasq) as `quay.io/poseidon/dnsmasq`. -## Docker +## Container Image -Run the container image with docker. +Run the container image. ```sh $ mkdir -p /var/lib/matchbox/assets