diff --git a/_service b/_service
index c498664..65d0393 100644
--- a/_service
+++ b/_service
@@ -4,8 +4,8 @@
https://github.com/containers/buildah.git
git
buildah
-1.7.2
-v1.7.2
+1.10.0
+v1.10.0
diff --git a/buildah-1.10.0.tar.xz b/buildah-1.10.0.tar.xz
new file mode 100644
index 0000000..31be55f
--- /dev/null
+++ b/buildah-1.10.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c719008729c2d1a2fcbabe99c1ad297cf6f069e7ed4199005166a591aa88c44f
+size 4916192
diff --git a/buildah-1.7.2.tar.xz b/buildah-1.7.2.tar.xz
deleted file mode 100644
index 087099d..0000000
--- a/buildah-1.7.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:47a6434ff7e3abc008ff8d5a19663742e4f7c514f31766e0d53cfe041ea12cf8
-size 2645512
diff --git a/buildah.changes b/buildah.changes
index 8b1f3e7..905cf5e 100644
--- a/buildah.changes
+++ b/buildah.changes
@@ -1,3 +1,231 @@
+-------------------------------------------------------------------
+Mon Aug 5 10:41:41 UTC 2019 - Sascha Grunert
+
+- Update build process to match the latest repository architecture
+- Update to v1.10.0
+ * vendor github.com/containers/image@v3.0.0
+ * Remove GO111MODULE in favor of -mod=vendor
+ * Vendor in containers/storage v1.12.16
+ * Add '-' minus syntax for removal of config values
+ * tests: enable overlay tests for rootless
+ * rootless, overlay: use fuse-overlayfs
+ * vendor github.com/containers/image@v2.0.1
+ * Added '-' syntax to remove volume config option
+ * delete successfully pushed message
+ * Add golint linter and apply fixes
+ * vendor github.com/containers/storage@v1.12.15
+ * Change wait to sleep in buildahimage readme
+ * Handle ReadOnly images when deleting images
+ * Add support for listing read/only images
+ * from/import: record the base image's digest, if it has one
+ * Fix CNI version retrieval to not require network connection
+ * Add misspell linter and apply fixes
+ * Add goimports linter and apply fixes
+ * Add stylecheck linter and apply fixes
+ * Add unconvert linter and apply fixes
+ * image: make sure we don't try to use zstd compression
+ * run.bats: skip the "z" flag when testing --mount
+ * Update to runc v1.0.0-rc8
+ * Update to match updated runtime-tools API
+ * bump github.com/opencontainers/runtime-tools to v0.9.0
+ * Build e2e tests using the proper build tags
+ * Add unparam linter and apply fixes
+ * Run: correct a typo in the --cap-add help text
+ * unshare: add a --mount flag
+ * fix push check image name is not empty
+ * add: fix slow copy with no excludes
+ * Add errcheck linter and fix missing error check
+ * Improve tests/tools/Makefile parallelism and abstraction
+ * Fix response body not closed resource leak
+ * Switch to golangci-lint
+ * Add gomod instructions and mailing list links
+ * On Masked path, check if /dev/null already mounted before mounting
+ * Update to containers/storage v1.12.13
+ * Refactor code in package imagebuildah
+ * Add rootless podman with NFS issue in documentation
+ * Add --mount for buildah run
+ * import method ValidateVolumeOpts from libpod
+ * Fix typo
+ * Makefile: set GO111MODULE=off
+ * rootless: add the built-in slirp DNS server
+ * Update docker/libnetwork to get rid of outdated sctp package
+ * Update buildah-login.md
+ * migrate to go modules
+ * install.md: mention go modules
+ * tests/tools: go module for test binaries
+ * fix --volume splits comma delimited option
+ * Add bud test for RUN with a priv'd command
+ * vendor logrus v1.4.2
+ * pkg/cli: panic when flags can't be hidden
+ * pkg/unshare: check all errors
+ * pull: check error during report write
+ * run_linux.go: ignore unchecked errors
+ * conformance test: catch copy error
+ * chroot/run_test.go: export funcs to actually be executed
+ * tests/imgtype: ignore error when shutting down the store
+ * testreport: check json error
+ * bind/util.go: remove unused func
+ * rm chroot/util.go
+ * imagebuildah: remove unused dedupeStringSlice
+ * StageExecutor: EnsureContainerPath: catch error from SecureJoin()
+ * imagebuildah/build.go: return instead of branching
+ * rmi: avoid redundant branching
+ * conformance tests: nilness: allocate map
+ * imagebuildah/build.go: avoid redundant filepath.Join()
+ * imagebuildah/build.go: avoid redundant os.Stat()
+ * imagebuildah: omit comparison to bool
+ * fix "ineffectual assignment" lint errors
+ * docker: ignore "repeats json tag" lint error
+ * pkg/unshare: use ... instead of iterating a slice
+ * conformance: bud test: use raw strings for regexes
+ * conformance suite: remove unused func/var
+ * buildah test suite: remove unused vars/funcs
+ * testreport: fix golangci-lint errors
+ * util: remove redundant return statement
+ * chroot: only log clean-up errors
+ * images_test: ignore golangci-lint error
+ * blobcache: log error when draining the pipe
+ * imagebuildah: check errors in deferred calls
+ * chroot: fix error handling in deferred funcs
+ * cmd: check all errors
+ * chroot/run_test.go: check errors
+ * chroot/run.go: check errors in deferred calls
+ * imagebuildah.Executor: remove unused onbuild field
+ * docker/types.go: remove unused struct fields
+ * util: use strings.ContainsRune instead of index check
+ * Cirrus: Initial implementation
+ * buildah-run: fix-out-of-range panic (2)
+ * Update containers/image to v2.0.0
+ * run: fix hang with run and --isolation=chroot
+ * run: fix hang when using run
+ * chroot: drop unused function call
+ * remove --> before imgageID on build
+ * Always close stdin pipe
+ * Write deny to setgroups when doing single user mapping
+ * Avoid including linux/memfd.h
+ * Add a test for the symlink pointing to a directory
+ * Add missing continue
+ * Fix the handling of symlinks to absolute paths
+ * Only set default network sysctls if not rootless
+ * Support --dns=none like podman
+ * fix bug --cpu-shares parsing typo
+ * Fix validate complaint
+ * Update vendor on containers/storage to v1.12.10
+ * Create directory paths for COPY thereby ensuring correct perms
+ * imagebuildah: use a stable sort for comparing build args
+ * imagebuildah: tighten up cache checking
+ * bud.bats: add a test verying the order of --build-args
+ * add -t to podman run
+ * imagebuildah: simplify screening by top layers
+ * imagebuildah: handle ID mappings for COPY --from
+ * imagebuildah: apply additionalTags ourselves
+ * bud.bats: test additional tags with cached images
+ * bud.bats: add a test for WORKDIR and COPY with absolute destinations
+ * Cleanup Overlay Mounts content
+ * Add support for file secret mounts
+ * Add ability to skip secrets in mounts file
+ * allow 32bit builds
+ * fix tutorial instructions
+ * imagebuilder: pass the right contextDir to Add()
+ * add: use fileutils.PatternMatcher for .dockerignore
+ * bud.bats: add another .dockerignore test
+ * unshare: fallback to single usermapping
+ * addHelperSymlink: clear the destination on os.IsExist errors
+ * bud.bats: test replacing symbolic links
+ * imagebuildah: fix handling of destinations that end with '/'
+ * bud.bats: test COPY with a final "/" in the destination
+ * linux: add check for sysctl before using it
+ * unshare: set _CONTAINERS_ROOTLESS_GID
+ * Rework buildahimamges
+ * build context: support https git repos
+ * Add a test for ENV special chars behaviour
+ * Check in new Dockerfiles
+ * Apply custom SHELL during build time
+ * config: expand variables only at the command line
+ * SetEnv: we only need to expand v once
+ * Add default /root if empty on chroot iso
+ * Add support for Overlay volumes into the container.
+ * Export buildah validate volume functions so it can share code with libpod
+ * Bump baseline test to F30
+ * Fix rootless handling of /dev/shm size
+ * Avoid fmt.Printf() in the library
+ * imagebuildah: tighten cache checking back up
+ * Handle WORKDIR with dangling target
+ * Default Authfile to proper path
+ * Make buildah run --isolation follow BUILDAH_ISOLATION environment
+ * Vendor in latest containers/storage and containers/image
+ * getParent/getChildren: handle layerless images
+ * imagebuildah: recognize cache images for layerless images
+ * bud.bats: test scratch images with --layers caching
+ * Get CHANGELOG.md updates
+ * Add some symlinks to test our .dockerignore logic
+ * imagebuildah: addHelper: handle symbolic links
+ * commit/push: use an everything-allowed policy
+ * Correct manpage formatting in files section
+ * Remove must be root statement from buildah doc
+ * Change image names to stable, testing and upstream
+ * Don't create directory on container
+ * Replace kubernetes/pause in tests with k8s.gcr.io/pause
+ * imagebuildah: don't remove intermediate images if we need them
+ * Rework buildahimagegit to buildahimageupstream
+ * Fix Transient Mounts
+ * Handle WORKDIRs that are symlinks
+ * allow podman to build a client for windows
+ * Touch up 1.9-dev to 1.9.0-dev
+ * Resolve symlink when checking container path
+ * commit: commit on every instruction, but not always with layers
+ * CommitOptions: drop the unused OnBuild field
+ * makeImageRef: pass in the whole CommitOptions structure
+ * cmd: API cleanup: stores before images
+ * run: check if SELinux is enabled
+ * Fix buildahimages Dockerfiles to include support for additionalimages mounted from host.
+ * Detect changes in rootdir
+ * Fix typo in buildah-pull(1)
+ * Vendor in latest containers/storage
+ * Keep track of any build-args used during buildah bud --layers
+ * commit: always set a parent ID
+ * imagebuildah: rework unused-argument detection
+ * fix bug dest path when COPY .dockerignore
+ * Move Host IDMAppings code from util to unshare
+ * Add BUILDAH_ISOLATION rootless back
+ * Travis CI: fail fast, upon error in any step
+ * imagebuildah: only commit images for intermediate stages if we have to
+ * Use errors.Cause() when checking for IsNotExist errors
+ * auto pass http_proxy to container
+ * imagebuildah: don't leak image structs
+ * Add Dockerfiles for buildahimages
+ * Bump to Replace golang 1.10 with 1.12
+ * add --dns* flags to buildah bud
+ * Add hack/build_speed.sh test speeds on building container images
+ * Create buildahimage Dockerfile for Quay
+ * rename 'is' to 'expect_output'
+ * squash.bats: test squashing in multi-layered builds
+ * bud.bats: test COPY --from in a Dockerfile while using the cache
+ * commit: make target image names optional
+ * Fix bud-args to allow comma separation
+ * oops, missed some tests in commit.bats
+ * new helper: expect_line_count
+ * New tests for #1467 (string slices in cmdline opts)
+ * Workarounds for dealing with travis; review feedback
+ * BATS tests - extensive but minor cleanup
+ * imagebuildah: defer pulling images for COPY --from
+ * imagebuildah: centralize COMMIT and image ID output
+ * Travis: do not use traviswait
+ * imagebuildah: only initialize imagebuilder configuration once per stage
+ * Make cleaner error on Dockerfile build errors
+ * unshare: move to pkg/
+ * unshare: move some code from cmd/buildah/unshare
+ * Fix handling of Slices versus Arrays
+ * imagebuildah: reorganize stage and per-stage logic
+ * imagebuildah: add empty layers for instructions
+ * Add missing step in installing into Ubuntu
+ * fix bug in .dockerignore support
+ * imagebuildah: deduplicate prepended "FROM" instructions
+ * Touch up intro
+ * commit: set created-by to the shell if it isn't set
+ * commit: check that we always set a "created-by"
+ * docs/buildah.md: add "containers-" prefixes under "SEE ALSO"
+
-------------------------------------------------------------------
Mon Apr 1 14:47:27 UTC 2019 - Richard Brown
@@ -33,7 +261,7 @@ Thu Jan 17 14:21:58 UTC 2019 - Richard Brown
* Properly format images JSON output
* Assume user 0 group 0, if /etc/passwd file in container.
* Add buildah info command
-- Full changelog: https://github.com/containers/buildah/releases/tag/v1.6
+- Full changelog: https://github.com/containers/buildah/releases/tag/v1.6
-------------------------------------------------------------------
Fri Nov 23 07:57:58 UTC 2018 - Valentin Rothberg
@@ -228,17 +456,17 @@ Thu Jun 7 06:46:21 UTC 2018 - vrothberg@suse.com
-------------------------------------------------------------------
Tue Jun 5 08:18:08 UTC 2018 - dcassany@suse.com
-- Refactor %license usage to a simpler form
+- Refactor %license usage to a simpler form
-------------------------------------------------------------------
Mon Jun 4 08:54:58 UTC 2018 - dcassany@suse.com
-- Make use of %license macro
+- Make use of %license macro
-------------------------------------------------------------------
Wed Apr 4 09:52:25 UTC 2018 - vrothberg@suse.com
-- Change build date to SOURCE_DATE_EPOCH to make builds reproducible.
+- Change build date to SOURCE_DATE_EPOCH to make builds reproducible.
-------------------------------------------------------------------
Thu Mar 29 08:50:12 UTC 2018 - vrothberg@suse.com
diff --git a/buildah.spec b/buildah.spec
index 5c326cb..c87737f 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -22,7 +22,7 @@
%define with_libostree 1
%endif
Name: buildah
-Version: 1.7.2
+Version: 1.10.0
Release: 0
Summary: Tool for building OCI containers
License: Apache-2.0
@@ -36,7 +36,6 @@ BuildRequires: fdupes
BuildRequires: git
BuildRequires: glib2-devel-static
BuildRequires: glibc-devel-static
-BuildRequires: go-go-md2man
BuildRequires: golang-packaging
BuildRequires: libapparmor-devel
BuildRequires: libassuan-devel
@@ -79,6 +78,8 @@ rm -rf $HOME/go/src/%{project}/*
cp -avr * $HOME/go/src/%{project}
cd $HOME/go/src/%{project}
+# TODO: remove this in a later release of buildah and let the make targets
+# discover the tags correctly
%if 0%{?with_libostree}
echo "Compiling with libostree support"
export BUILDTAGS="seccomp apparmor"
@@ -87,16 +88,8 @@ echo "Compiling without libostree support"
export BUILDTAGS="seccomp apparmor containers_image_ostree_stub"
%endif
-export CNIVersion=`sed -e '\,github.com/containernetworking/cni, !d' -e 's,.* ,,g' vendor.conf`
# Build buildah
-go build -tags "$BUILDTAGS" \
- -buildmode=pie \
- -ldflags '-s -w -X main.buildInfo='$SOURCE_DATE_EPOCH' -X main.cniVersion='$CNIVersion'' \
- -o bin/buildah \
- %{project}/cmd/buildah
-
-# Build manpages
-make %{?_smp_mflags} -C docs
+make %{?_smp_mflags} BUILDTAGS='$BUILDTAGS' GIT_COMMIT=unknown EXTRALDFLAGS=-buildmode=pie
%check
# Too many tests fail due to the restricted permissions in the build enviroment.
@@ -105,7 +98,7 @@ make %{?_smp_mflags} -C docs
%install
cd $HOME/go/src/%{project}
-install -D -m 0755 bin/buildah %{buildroot}/%{_bindir}/buildah
+install -D -m 0755 buildah %{buildroot}/%{_bindir}/buildah
install -d %{buildroot}/%{_mandir}/man1
install -m 0644 docs/buildah*.1 %{buildroot}/%{_mandir}/man1
install -D -m 0644 contrib/completions/bash/buildah %{buildroot}/%{_datadir}/bash-completion/completions/buildah