opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-19 16:33:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2622 from baude/protectdarwin

Browse Source 
Add gating tasks
This commit is contained in:
OpenShift Merge Robot
2019-03-13 11:06:43 -07:00
committed by GitHub
parent 31b09d2f73 c8ca027938
commit a65788c876
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.cirrus.yml
View File

@ -135,8 +135,10 @@ gating_task:
# This task builds Podman with different buildtags to ensure the build does # This task builds Podman with different buildtags to ensure the build does
# not break. # not break.
build_script: build_script:
- '/usr/local/bin/entrypoint.sh clean podman'
- '/usr/local/bin/entrypoint.sh clean podman-remote'
- '/usr/local/bin/entrypoint.sh clean podman BUILDTAGS="exclude_graphdriver_devicemapper selinux seccomp"' - '/usr/local/bin/entrypoint.sh clean podman BUILDTAGS="exclude_graphdriver_devicemapper selinux seccomp"'
- '/usr/local/bin/entrypoint.sh clean podman-remote-darwin'
build_each_commit_task: build_each_commit_task:

2
Makefile
View File

@ -1,6 +1,6 @@
GO ?= go GO ?= go
DESTDIR ?= / DESTDIR ?= /
EPOCH_TEST_COMMIT ?= 4b80517b6a638ff06f8ad432f0f0f5839283d058 EPOCH_TEST_COMMIT ?= 1c45b42e9ff972d9645735118635e4186e6411f8
HEAD ?= HEAD HEAD ?= HEAD
CHANGELOG_BASE ?= HEAD~ CHANGELOG_BASE ?= HEAD~
CHANGELOG_TARGET ?= HEAD CHANGELOG_TARGET ?= HEAD

2
libpod/runtime_volume_unsupported.go
View File

@ -6,7 +6,7 @@ import (
"context" "context"
) )
func (r *Runtime) removeVolume(ctx context.Context, v *Volume, force, prune bool) error { func (r *Runtime) removeVolume(ctx context.Context, v *Volume, force bool) error {
return ErrNotImplemented return ErrNotImplemented
} }

2
pkg/rootless/rootless_unsupported.go
View File

@ -41,7 +41,7 @@ func SkipStorageSetup() bool {
// JoinNS re-exec podman in a new userNS and join the user namespace of the specified // JoinNS re-exec podman in a new userNS and join the user namespace of the specified
// PID. // PID.
func JoinNS(pid uint) (bool, int, error) { func JoinNS(pid uint, preserveFDs int) (bool, int, error) {
return false, -1, errors.New("this function is not supported on this os") return false, -1, errors.New("this function is not supported on this os")
} }