From 789e2dc2f20add9cdb24a5817fac47f8dbcb64c0 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Jun 14 2017 17:41:13 +0000 Subject: Release Candidate 1 All features have now been implemented. --- diff --git a/.gitignore b/.gitignore index eb7a05d..2e8b4e3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /buildah-a0a5333.tar.gz +/buildah-597d2ab.tar.gz diff --git a/buildah.spec b/buildah.spec index 20a1e4b..b8baad1 100644 --- a/buildah.spec +++ b/buildah.spec @@ -21,16 +21,18 @@ # https://github.com/projectatomic/buildah %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit a0a5333b94264d1fb1e072d63bcb98f9e2981b49 +%global commit 597d2ab9fa41b2db8ce0c6d8be05edb462d3b31d %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: buildah -Version: 0.0.1 +Version: 0.1.0 Release: 1.git%{shortcommit}%{?dist} Summary: A command line tool used to creating OCI Images License: ASL 2.0 URL: https://%{provider_prefix} Source: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +Source1: storage.conf +Source2: storage.conf.5.md ExclusiveArch: x86_64 aarch64 ppc64le # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. @@ -43,7 +45,7 @@ BuildRequires: gpgme-devel BuildRequires: device-mapper-devel BuildRequires: btrfs-progs-devel BuildRequires: libassuan-devel -Requires: runc >= 1.0.0-6 +Requires: runc >= 1.0.0-7 Requires: skopeo-containers Provides: %{repo} = %{version}-%{release} @@ -74,6 +76,10 @@ make all %install export GOPATH=$(pwd)/_build:$(pwd):%{gopath} +mkdir -p %{buildroot}%{_sysconfdir} +install -m0644 %SOURCE1 %{buildroot}%{_sysconfdir}/storage.conf +mkdir -p %{buildroot}%{_mandir}/man5 +go-md2man -in %SOURCE2 -out %{buildroot}%{_mandir}/man5/storage.conf.1 make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions @@ -85,10 +91,16 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions %doc README.md %{_bindir}/%{name} %{_mandir}/man1/buildah* +%{_mandir}/man5/storage* %dir %{_datadir}/bash-completion +%{_sysconfdir}/storage.conf %config(noreplace) %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/buildah %changelog +* Fri Apr 14 2017 Dan Walsh 0.1.0-1.git597d2ab9 +- Release Candidate 1 +- All features have now been implemented. + * Fri Apr 14 2017 Dan Walsh 0.0.1-1.git7a0a5333 - First package for Fedora diff --git a/sources b/sources index e0baa19..edcf8bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (buildah-a0a5333.tar.gz) = f8ca5b5b5287239d3ce85d042dc3b886fe590e17a870e4c119e0996fef2c938437d324c4da22536468a305e9245a127f27f4b23545beb59fafbefc57c141e113 +SHA512 (buildah-597d2ab.tar.gz) = 89f86b12fd2b96c52ce6c21e6583a2099fa4b8f8de0c7d18eef698ebdb846e7b33441c78ac8c8be4117d3b59a9c90c1987f490278b23e7fc5c9d8d366677a35a diff --git a/storage.conf b/storage.conf new file mode 100644 index 0000000..519a0ab --- /dev/null +++ b/storage.conf @@ -0,0 +1,17 @@ +# The "container storage" table contains all of the server options. +[storage] + +# Default Storage Driver +driver = "overlay" + +# Temporary storage location +runroot = "/var/run/containers/storage" + +# Primary Read/Write location of container storage +graphroot = "/var/lib/containers/storage" + +[storage.options] +# AdditionalImageStores is used to pass paths to additional Read/Only image stores +# Must be comma separated list. +additionalimagestores = [ +] diff --git a/storage.conf.5.md b/storage.conf.5.md new file mode 100644 index 0000000..39a8fb7 --- /dev/null +++ b/storage.conf.5.md @@ -0,0 +1,49 @@ +% storage.conf(5) Container Storage Configuration File +% Dan Walsh +% May 2017 + +# NAME +storage.conf - Syntax of Container Storage configuration file + +# DESCRIPTION +The STORAGE configuration file specifies all of the available container storage options +for tools using shared container storage, but in a TOML format that can be more easily modified +and versioned. + +# FORMAT +The [TOML format][toml] is used as the encoding of the configuration file. +Every option and subtable listed here is nested under a global "storage" table. +No bare options are used. The format of TOML can be simplified to: + + [table] + option = value + + [table.subtable1] + option = value + + [table.subtable2] + option = value + +## STORAGE TABLE + +The `storage` table supports the following options: + + +**graphroot**="" + container storage graph dir (default: "/var/lib/containers/storage") + Default directory to store all writable content created by container storage programs + +**runroot**="" + container storage run dir (default: "/var/run/containers/storage") + Default directory to store all temporary writable content created by container storage programs + +**driver**="" + container storage driver (default is "overlay") + Default Copy On Write (COW) container storage driver + +**additionalimagestores**=[] + Paths to additional congtainer image stores. Usually these are read/only and stored on remote network shares. + +# HISTORY +May 2017, Originally compiled by Dan Walsh +Format copied from crio.conf man page created by Aleksa Sarai