init commit for coverting to podman
This commit is contained in:
@@ -10,7 +10,7 @@ import (
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/drone-runners/drone-runner-docker/engine/resource"
|
||||
"github.com/drone-runners/drone-runner-podman/engine/resource"
|
||||
"github.com/drone/drone-go/drone"
|
||||
"github.com/drone/runner-go/manifest"
|
||||
)
|
||||
@@ -130,7 +130,7 @@ func checkStep(step *resource.Step, trusted bool) error {
|
||||
}
|
||||
for _, mount := range step.Volumes {
|
||||
switch mount.Name {
|
||||
case "workspace", "_workspace", "_docker_socket":
|
||||
case "workspace", "_workspace", "_podman_socket":
|
||||
return fmt.Errorf("linter: invalid volume name: %s", mount.Name)
|
||||
}
|
||||
if strings.HasPrefix(filepath.Clean(mount.MountPath), "/run/drone") {
|
||||
@@ -157,7 +157,7 @@ func checkVolumes(pipeline *resource.Pipeline, trusted bool) error {
|
||||
switch volume.Name {
|
||||
case "":
|
||||
return fmt.Errorf("linter: missing volume name")
|
||||
case "workspace", "_workspace", "_docker_socket":
|
||||
case "workspace", "_workspace", "_podman_socket":
|
||||
return fmt.Errorf("linter: invalid volume name: %s", volume.Name)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
"path"
|
||||
"testing"
|
||||
|
||||
"github.com/drone-runners/drone-runner-docker/engine/resource"
|
||||
"github.com/drone-runners/drone-runner-podman/engine/resource"
|
||||
"github.com/drone/drone-go/drone"
|
||||
"github.com/drone/runner-go/manifest"
|
||||
)
|
||||
@@ -47,7 +47,7 @@ func TestLint(t *testing.T) {
|
||||
path: "testdata/pipeline_volume_invalid_name.yml",
|
||||
trusted: false,
|
||||
invalid: true,
|
||||
message: "linter: invalid volume name: _docker_socket",
|
||||
message: "linter: invalid volume name: _podman_socket",
|
||||
},
|
||||
// user should not be trying to mount internal or restricted
|
||||
// volume paths.
|
||||
|
||||
4
engine/linter/testdata/duplicate_name.yml
vendored
4
engine/linter/testdata/duplicate_name.yml
vendored
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: podman
|
||||
name: default
|
||||
|
||||
steps:
|
||||
@@ -21,4 +21,4 @@ steps:
|
||||
- go build
|
||||
- go test
|
||||
|
||||
...
|
||||
...
|
||||
|
||||
4
engine/linter/testdata/duplicate_step.yml
vendored
4
engine/linter/testdata/duplicate_step.yml
vendored
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: podman
|
||||
name: default
|
||||
|
||||
steps:
|
||||
@@ -14,4 +14,4 @@ steps:
|
||||
image: golang
|
||||
commands:
|
||||
- go build
|
||||
- go test
|
||||
- go test
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: podman
|
||||
name: default
|
||||
|
||||
steps:
|
||||
|
||||
2
engine/linter/testdata/invalid_arch.yml
vendored
2
engine/linter/testdata/invalid_arch.yml
vendored
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: podman
|
||||
name: linux
|
||||
|
||||
platform:
|
||||
|
||||
2
engine/linter/testdata/invalid_os.yml
vendored
2
engine/linter/testdata/invalid_os.yml
vendored
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: podman
|
||||
name: linux
|
||||
|
||||
platform:
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: podman
|
||||
name: linux
|
||||
|
||||
steps:
|
||||
|
||||
4
engine/linter/testdata/missing_dep.yml
vendored
4
engine/linter/testdata/missing_dep.yml
vendored
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: podman
|
||||
name: default
|
||||
|
||||
steps:
|
||||
@@ -15,4 +15,4 @@ steps:
|
||||
- go build
|
||||
- go test
|
||||
depends_on:
|
||||
- foo
|
||||
- foo
|
||||
|
||||
2
engine/linter/testdata/missing_image.yml
vendored
2
engine/linter/testdata/missing_image.yml
vendored
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: podman
|
||||
name: linux
|
||||
|
||||
steps:
|
||||
|
||||
2
engine/linter/testdata/missing_name.yml
vendored
2
engine/linter/testdata/missing_name.yml
vendored
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: podman
|
||||
name: linux
|
||||
|
||||
steps:
|
||||
|
||||
2
engine/linter/testdata/pipeline_device.yml
vendored
2
engine/linter/testdata/pipeline_device.yml
vendored
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: podman
|
||||
name: linux
|
||||
|
||||
steps:
|
||||
|
||||
2
engine/linter/testdata/pipeline_dns.yml
vendored
2
engine/linter/testdata/pipeline_dns.yml
vendored
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: podman
|
||||
name: linux
|
||||
|
||||
steps:
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: podman
|
||||
name: linux
|
||||
|
||||
steps:
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: podman
|
||||
name: linux
|
||||
|
||||
steps:
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: podman
|
||||
name: linux
|
||||
|
||||
steps:
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: podman
|
||||
name: linux
|
||||
|
||||
steps:
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: podman
|
||||
name: linux
|
||||
|
||||
steps:
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: podman
|
||||
name: linux
|
||||
|
||||
steps:
|
||||
- name: test
|
||||
image: docker
|
||||
image: podman
|
||||
volumes:
|
||||
- name: _docker_socket
|
||||
path: /var/run/docker.sock
|
||||
- name: _podman_socket
|
||||
path: /run/podman/podman.sock
|
||||
commands:
|
||||
- docker system prune
|
||||
- podman system prune
|
||||
|
||||
|
||||
2
engine/linter/testdata/service_device.yml
vendored
2
engine/linter/testdata/service_device.yml
vendored
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: podman
|
||||
name: linux
|
||||
|
||||
steps:
|
||||
|
||||
2
engine/linter/testdata/service_port_host.yml
vendored
2
engine/linter/testdata/service_port_host.yml
vendored
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: podman
|
||||
name: linux
|
||||
|
||||
steps:
|
||||
|
||||
4
engine/linter/testdata/simple.yml
vendored
4
engine/linter/testdata/simple.yml
vendored
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: podman
|
||||
name: amd64
|
||||
|
||||
steps:
|
||||
@@ -36,4 +36,4 @@ steps:
|
||||
|
||||
depends_on:
|
||||
- amd64
|
||||
...
|
||||
...
|
||||
|
||||
2
engine/linter/testdata/volume_empty_dir.yml
vendored
2
engine/linter/testdata/volume_empty_dir.yml
vendored
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: podman
|
||||
name: linux
|
||||
|
||||
steps:
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: podman
|
||||
name: linux
|
||||
|
||||
steps:
|
||||
|
||||
2
engine/linter/testdata/volume_host_path.yml
vendored
2
engine/linter/testdata/volume_host_path.yml
vendored
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: podman
|
||||
name: linux
|
||||
|
||||
steps:
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: podman
|
||||
name: linux
|
||||
|
||||
steps:
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: podman
|
||||
name: linux
|
||||
|
||||
steps:
|
||||
|
||||
4
engine/linter/testdata/volume_restricted.yml
vendored
4
engine/linter/testdata/volume_restricted.yml
vendored
@@ -1,6 +1,6 @@
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: podman
|
||||
name: linux
|
||||
|
||||
steps:
|
||||
@@ -15,4 +15,4 @@ steps:
|
||||
|
||||
volumes:
|
||||
- name: vol
|
||||
temp: {}
|
||||
temp: {}
|
||||
|
||||
Reference in New Issue
Block a user