fix rebase conflicts

Author: CybotTM

.github/renovate.json

@@ -9,7 +9,11 @@ env:
   IMAGE_NAME: "${{ github.repository_owner }}/ofelia"
 
 jobs:
-  goreleaser:
+  release:
+    strategy:
+      fail-fast: false
+      matrix:
+        goos: [linux, darwin]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code

.github/workflows/docker.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - master
-      - 'renovate/**'
   pull_request:
     branches:
       - master

.github/workflows/release.yml

@@ -59,6 +59,7 @@ See [Jobs reference documentation](docs/jobs.md) for all available parameters.
 - `smtp-port` - port number of the SMTP server.
 - `smtp-user` - user name used to connect to the SMTP server.
 - `smtp-password` - password used to connect to the SMTP server.
+- `smtp-tls-skip-verify` - when `true` ignores certificate signed by unknown authority error.
 - `email-to` - mail address of the receiver of the mail.
 - `email-from` - mail address of the sender of the mail.
 - `mail-only-on-error` - only send a mail if the execution was not successful.

.github/workflows/renovate.yml

@@ -15,110 +15,6 @@ const (
 	serviceLabel        = labelPrefix + ".service"
 )
 
-var (
-	errNoContainersMatchingFilters = errors.New("no containers matching filters")
-	errInvalidDockerFilter         = errors.New("invalid docker filter")
-	errFailedToListContainers      = errors.New("failed to list containers")
-)
-
-func parseFilter(filter string) (key, value string, err error) {
-	parts := strings.SplitN(filter, "=", 2)
-	if len(parts) != 2 {
-		return "", "", errInvalidDockerFilter
-	}
-	return parts[0], parts[1], nil
-}
-
-func getLabels(d *docker.Client, filterFlags []string) (map[string]map[string]string, error) {
-	// sleep before querying containers
-	// because docker not always propagating labels in time
-	// so ofelia app can't find it's own container
-	if IsDockerEnv {
-		time.Sleep(1 * time.Second)
-	}
-
-	var filters = map[string][]string{
-		"label": {requiredLabelFilter},
-	}
-	for _, f := range filterFlags {
-		key, value, err := parseFilter(f)
-		if err != nil {
-			return nil, fmt.Errorf("%w: %s", err, f)
-		}
-		filters[key] = append(filters[key], value)
-	}
-
-	conts, err := d.ListContainers(docker.ListContainersOptions{Filters: filters})
-	if err != nil {
-		return nil, fmt.Errorf("%w: %w", errFailedToListContainers, err)
-	} else if len(conts) == 0 {
-		return nil, fmt.Errorf("%w: %v", errNoContainersMatchingFilters, filters)
-	}
-
-	var labels = make(map[string]map[string]string)
-
-	for _, c := range conts {
-		if len(c.Names) > 0 && len(c.Labels) > 0 {
-			name := strings.TrimPrefix(c.Names[0], "/")
-			for k := range c.Labels {
-				// remove all not relevant labels
-				if !strings.HasPrefix(k, labelPrefix) {
-					delete(c.Labels, k)
-					continue
-				}
-			}
-
-			labels[name] = c.Labels
-		}
-	}
-
-	return labels, nil
-}
-
-||||||| parent of 992b1a2 (Applied changes)
-func getLabels(d *docker.Client) (map[string]map[string]string, error) {
-	// sleep before querying containers
-	// because docker not always propagating labels in time
-	// so ofelia app can't find it's own container
-	if IsDockerEnv {
-		time.Sleep(1 * time.Second)
-	}
-
-	conts, err := d.ListContainers(docker.ListContainersOptions{
-		Filters: map[string][]string{
-			"label": {requiredLabelFilter},
-		},
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	if len(conts) == 0 {
-		return nil, errors.New("Couldn't find containers with label 'ofelia.enabled=true'")
-	}
-
-	var labels = make(map[string]map[string]string)
-
-	for _, c := range conts {
-		if len(c.Names) > 0 && len(c.Labels) > 0 {
-			name := strings.TrimPrefix(c.Names[0], "/")
-			for k := range c.Labels {
-				// remove all not relevant labels
-				if !strings.HasPrefix(k, labelPrefix) {
-					delete(c.Labels, k)
-					continue
-				}
-			}
-
-			labels[name] = c.Labels
-		}
-	}
-
-	return labels, nil
-}
-
-=======
->>>>>>> 992b1a2 (Applied changes)
 func (c *Config) buildFromDockerLabels(labels map[string]map[string]string) error {
 	execJobs := make(map[string]map[string]interface{})
 	localJobs := make(map[string]map[string]interface{})