mirror of
https://gitea.com/gitea/act_runner.git
synced 2026-08-07 01:14:22 +02:00
24c13a1fd0
Revert #1136 and use actionslib instead. revert chore: bump the module path to `/v3`, take the version from the VCS stamp (#1136) gitea can not consume the runner's api by version while it's version mismatches the module version: ``` go: gitea.com/gitea/runner@v3.0.1: invalid version: module contains a go.mod file, so module path must match major version ("gitea.com/gitea/runner/v3") ``` Fix that by bumping the module version now. The existing `v3.0.0` and `v3.0.1` tags stay unusable, so a new tag is needed after this lands. Also drop the version `-X` linker flags, which would otherwise have to repeat the new path in both `Makefile` and `.goreleaser.yaml`, where a stale path makes injection silently no-op. Go has recorded the module version in the build info since 1.24, so `Version()` reads it from there, keeping the variable as an override for builds without a VCS stamp. That part started as https://gitea.com/gitea/runner/pulls/1137 but belongs here: the stamp resolves against the tags that are legal for the module path, so without the `/v3` bump it would report `v1.0.9-0.<ts>-<sha>`. Since `release-nightly.yml` triggers on every push to `main`, splitting them would publish a nightly with a `v1` version. --------- Co-authored-by: bircni <bircni@icloud.com> Reviewed-on: https://gitea.com/gitea/runner/pulls/1136 Reviewed-by: techknowlogick <9+techknowlogick@noreply.gitea.com> Reviewed-by: bircni <bircni@icloud.com> Co-authored-by: silverwind <me@silverwind.io> Reviewed-on: https://gitea.com/gitea/runner/pulls/1148 Reviewed-by: Zettat123 <39446+zettat123@noreply.gitea.com>
72 lines
2.0 KiB
Go
72 lines
2.0 KiB
Go
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
// Copyright 2021 The nektos/act Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
//go:build !(WITHOUT_DOCKER || !(linux || darwin || windows || netbsd))
|
|
|
|
package container
|
|
|
|
import (
|
|
"context"
|
|
|
|
"gitea.com/gitea/runner/act/common"
|
|
|
|
"github.com/distribution/reference"
|
|
"github.com/docker/cli/cli/config"
|
|
"github.com/moby/moby/api/types/registry"
|
|
)
|
|
|
|
func LoadDockerAuthConfig(ctx context.Context, image string) (registry.AuthConfig, error) {
|
|
logger := common.Logger(ctx)
|
|
// config.LoadDefaultConfigFile panics on nil io.Writer when the config
|
|
// file is malformed; use config.Load to route errors through the logger.
|
|
cfg, err := config.Load(config.Dir())
|
|
if err != nil {
|
|
logger.Warnf("Could not load docker config: %v", err)
|
|
return registry.AuthConfig{}, err
|
|
}
|
|
registryKey := registryAuthConfigKey("docker.io")
|
|
if image != "" {
|
|
if registryRef, refErr := reference.ParseNormalizedNamed(image); refErr != nil {
|
|
logger.Warnf("Could not normalize image reference: %v", refErr)
|
|
} else {
|
|
registryKey = registryAuthConfigKey(reference.Domain(registryRef))
|
|
}
|
|
}
|
|
|
|
authConfig, err := cfg.GetAuthConfig(registryKey)
|
|
if err != nil {
|
|
logger.Warnf("Could not get auth config from docker config: %v", err)
|
|
return registry.AuthConfig{}, err
|
|
}
|
|
|
|
return registry.AuthConfig(authConfig), nil
|
|
}
|
|
|
|
func LoadDockerAuthConfigs(ctx context.Context) map[string]registry.AuthConfig {
|
|
logger := common.Logger(ctx)
|
|
cfg, err := config.Load(config.Dir())
|
|
if err != nil {
|
|
logger.Warnf("Could not load docker config: %v", err)
|
|
return nil
|
|
}
|
|
creds, err := cfg.GetAllCredentials()
|
|
if err != nil {
|
|
logger.Warnf("Could not get docker auth configs: %v", err)
|
|
return nil
|
|
}
|
|
authConfigs := make(map[string]registry.AuthConfig, len(creds))
|
|
for k, v := range creds {
|
|
authConfigs[k] = registry.AuthConfig(v)
|
|
}
|
|
|
|
return authConfigs
|
|
}
|
|
|
|
func registryAuthConfigKey(domainName string) string {
|
|
if domainName == "docker.io" || domainName == "index.docker.io" {
|
|
return "https://index.docker.io/v1/"
|
|
}
|
|
return domainName
|
|
}
|