chaos/drone-runner-podman
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

init commit for coverting to podman

Browse Source
This commit is contained in:
zerodoctor
2023-10-04 23:19:30 -05:00
parent 7e9969423c
commit 04332e5527
96 changed files with 2034 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
command/daemon/config.go
View File

@@ -102,14 +102,14 @@ type Config struct {
SkipVerify bool `envconfig:"DRONE_REGISTRY_PLUGIN_SKIP_VERIFY"`
}
Docker struct {
Config string `envconfig:"DRONE_DOCKER_CONFIG"`
Stream bool `envconfig:"DRONE_DOCKER_STREAM_PULL" default:"true"`
Podman struct {
Config string `envconfig:"DRONE_PODMAN_CONFIG"`
Stream bool `envconfig:"DRONE_PODMAN_STREAM_PULL" default:"true"`
}
Tmate struct {
Enabled bool `envconfig:"DRONE_TMATE_ENABLED" default:"false"`
Image string `envconfig:"DRONE_TMATE_IMAGE" default:"drone/drone-runner-docker:1"`
Image string `envconfig:"DRONE_TMATE_IMAGE" default:"drone/drone-runner-podman:1"`
Server string `envconfig:"DRONE_TMATE_HOST"`
Port string `envconfig:"DRONE_TMATE_PORT"`
RSA string `envconfig:"DRONE_TMATE_FINGERPRINT_RSA"`

37
command/daemon/daemon.go
View File

@@ -8,11 +8,11 @@ import (
"context"
"time"
"github.com/drone-runners/drone-runner-docker/engine"
"github.com/drone-runners/drone-runner-docker/engine/compiler"
"github.com/drone-runners/drone-runner-docker/engine/linter"
"github.com/drone-runners/drone-runner-docker/engine/resource"
"github.com/drone-runners/drone-runner-docker/internal/match"
"github.com/drone-runners/drone-runner-podman/engine"
"github.com/drone-runners/drone-runner-podman/engine/compiler"
"github.com/drone-runners/drone-runner-podman/engine/linter"
"github.com/drone-runners/drone-runner-podman/engine/resource"
"github.com/drone-runners/drone-runner-podman/internal/match"
"github.com/drone/runner-go/client"
"github.com/drone/runner-go/environ/provider"
@@ -82,31 +82,12 @@ func (c *daemonCommand) run(*kingpin.ParseContext) error {
)
opts := engine.Opts{
HidePull: !config.Docker.Stream,
HidePull: !config.Podman.Stream,
}
engine, err := engine.NewEnv(opts)
engine, err := engine.NewEnv(context.Background(), opts)
if err != nil {
logrus.WithError(err).
Fatalln("cannot load the docker engine")
}
for {
err := engine.Ping(ctx)
if err == context.Canceled {
break
}
select {
case <-ctx.Done():
return ctx.Err()
default:
}
if err != nil {
logrus.WithError(err).
Errorln("cannot ping the docker daemon")
time.Sleep(time.Second)
} else {
logrus.Debugln("successfully pinged the docker daemon")
break
}
Fatalln("cannot load the podman engine")
}
remote := remote.New(cli)
@@ -162,7 +143,7 @@ func (c *daemonCommand) run(*kingpin.ParseContext) error {
),
Registry: registry.Combine(
registry.File(
config.Docker.Config,
config.Podman.Config,
),
registry.External(
config.Registry.Endpoint,

18
command/daemon/process.go
View File

@@ -5,10 +5,12 @@
package daemon
import (
"github.com/drone-runners/drone-runner-docker/engine"
"github.com/drone-runners/drone-runner-docker/engine/compiler"
"github.com/drone-runners/drone-runner-docker/engine/linter"
"github.com/drone-runners/drone-runner-docker/engine/resource"
"context"
"github.com/drone-runners/drone-runner-podman/engine"
"github.com/drone-runners/drone-runner-podman/engine/compiler"
"github.com/drone-runners/drone-runner-podman/engine/linter"
"github.com/drone-runners/drone-runner-podman/engine/resource"
"github.com/drone/runner-go/pipeline/uploader"
"github.com/drone/runner-go/client"
@@ -54,12 +56,12 @@ func (c *processCommand) run(*kingpin.ParseContext) error {
)
opts := engine.Opts{
HidePull: !config.Docker.Stream,
HidePull: !config.Podman.Stream,
}
engine, err := engine.NewEnv(opts)
engine, err := engine.NewEnv(context.Background(), opts)
if err != nil {
logrus.WithError(err).
Fatalln("cannot load the docker engine")
Fatalln("cannot load the podman engine")
}
remote := remote.New(cli)
@@ -98,7 +100,7 @@ func (c *processCommand) run(*kingpin.ParseContext) error {
),
Registry: registry.Combine(
registry.File(
config.Docker.Config,
config.Podman.Config,
),
registry.External(
config.Registry.Endpoint,