Commit 8ac39986 authored by Lorenz Brun's avatar Lorenz Brun

Fixes for docker executor deps

parent 8d31c5b9
Pipeline #16957364 failed with stages
in 1 minute and 17 seconds
This diff is collapsed.
......@@ -27,6 +27,9 @@ ignored = ["github.com/docker/docker/vendor/golang.org/x/net/context"]
name = "github.com/ugorji/go"
revision = "8c0409fcbb70099c748d71f714529204975f6c3f"
[[override]]
name = "github.com/opencontainers/runtime-spec"
revision = "1c7c27d043c2a5e513a44084d2b10d77d1402b8c"
[[constraint]]
name = "github.com/BurntSushi/toml"
......@@ -64,7 +67,7 @@ ignored = ["github.com/docker/docker/vendor/golang.org/x/net/context"]
name = "github.com/prometheus/client_model"
[[constraint]]
name = "github.com/sirupsen/logrus"
name = "github.com/Sirupsen/logrus"
[[constraint]]
name = "github.com/stretchr/testify"
......
......@@ -4,7 +4,7 @@ import (
"os"
"path"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"github.com/urfave/cli"
"gitlab.com/gitlab-org/gitlab-runner/common"
"gitlab.com/gitlab-org/gitlab-runner/helpers/cli"
......
......@@ -5,7 +5,7 @@ import (
"os/exec"
"strings"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"github.com/urfave/cli"
"gitlab.com/ayufan/golang-cli-helpers"
"gitlab.com/gitlab-org/gitlab-runner/common"
......
......@@ -4,7 +4,7 @@ import (
"sync"
"time"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"gitlab.com/gitlab-org/gitlab-runner/common"
)
......
......@@ -5,7 +5,7 @@ import (
"os"
"time"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"github.com/urfave/cli"
"gitlab.com/gitlab-org/gitlab-runner/common"
......
......@@ -6,7 +6,7 @@ import (
"io"
"os"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"gitlab.com/gitlab-org/gitlab-runner/common"
)
......
......@@ -7,7 +7,7 @@ import (
"path"
"time"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"github.com/urfave/cli"
"gitlab.com/gitlab-org/gitlab-runner/common"
......
......@@ -7,7 +7,7 @@ import (
"path/filepath"
"time"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"github.com/urfave/cli"
"gitlab.com/gitlab-org/gitlab-runner/common"
......
......@@ -9,7 +9,7 @@ import (
"testing"
"time"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"github.com/stretchr/testify/assert"
"gitlab.com/gitlab-org/gitlab-runner/helpers"
......
......@@ -9,7 +9,7 @@ import (
"path/filepath"
"time"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"github.com/urfave/cli"
"gitlab.com/gitlab-org/gitlab-runner/common"
......
......@@ -10,7 +10,7 @@ import (
"testing"
"time"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"github.com/stretchr/testify/assert"
"gitlab.com/gitlab-org/gitlab-runner/helpers"
......
......@@ -13,7 +13,7 @@ import (
"strings"
"time"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
)
type fileArchiver struct {
......
package helpers
import (
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"time"
)
......
package commands
import (
log "github.com/sirupsen/logrus"
log "github.com/Sirupsen/logrus"
"github.com/urfave/cli"
"gitlab.com/gitlab-org/gitlab-runner/common"
)
......
......@@ -17,7 +17,7 @@ import (
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/urfave/cli"
log "github.com/sirupsen/logrus"
log "github.com/Sirupsen/logrus"
"gitlab.com/gitlab-org/gitlab-runner/common"
"gitlab.com/gitlab-org/gitlab-runner/helpers"
......
......@@ -7,7 +7,7 @@ import (
"strconv"
"strings"
log "github.com/sirupsen/logrus"
log "github.com/Sirupsen/logrus"
"github.com/urfave/cli"
"gitlab.com/gitlab-org/gitlab-runner/common"
......
......@@ -6,7 +6,7 @@ import (
"runtime"
"github.com/ayufan/golang-kardianos-service"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"github.com/urfave/cli"
"gitlab.com/gitlab-org/gitlab-runner/common"
"gitlab.com/gitlab-org/gitlab-runner/helpers"
......
......@@ -4,7 +4,7 @@ import (
"os"
"testing"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"gitlab.com/gitlab-org/gitlab-runner/helpers/service/mocks"
)
......
......@@ -6,7 +6,7 @@ import (
"syscall"
"time"
log "github.com/sirupsen/logrus"
log "github.com/Sirupsen/logrus"
"github.com/tevino/abool"
"github.com/urfave/cli"
......
......@@ -3,7 +3,7 @@ package commands
import (
"github.com/urfave/cli"
log "github.com/sirupsen/logrus"
log "github.com/Sirupsen/logrus"
"gitlab.com/gitlab-org/gitlab-runner/common"
"gitlab.com/gitlab-org/gitlab-runner/network"
)
......
......@@ -4,7 +4,7 @@ import (
"os"
"runtime"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
)
func userModeWarning(withRun bool) {
......
......@@ -3,7 +3,7 @@ package commands
import (
"errors"
log "github.com/sirupsen/logrus"
log "github.com/Sirupsen/logrus"
"github.com/urfave/cli"
"gitlab.com/gitlab-org/gitlab-runner/common"
......
......@@ -11,7 +11,7 @@ import (
"strings"
"time"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"gitlab.com/gitlab-org/gitlab-runner/helpers"
"gitlab.com/gitlab-org/gitlab-runner/helpers/tls"
......
......@@ -3,7 +3,7 @@ package common
import (
"fmt"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"gitlab.com/gitlab-org/gitlab-runner/helpers"
"gitlab.com/gitlab-org/gitlab-runner/helpers/url"
......
......@@ -5,7 +5,7 @@ import (
"context"
"testing"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"github.com/stretchr/testify/assert"
)
......
package common
import (
log "github.com/sirupsen/logrus"
log "github.com/Sirupsen/logrus"
"github.com/urfave/cli"
"gitlab.com/ayufan/golang-cli-helpers"
)
......
......@@ -13,7 +13,7 @@ import (
"path/filepath"
"github.com/BurntSushi/toml"
log "github.com/sirupsen/logrus"
log "github.com/Sirupsen/logrus"
"gitlab.com/gitlab-org/gitlab-runner/helpers"
"gitlab.com/gitlab-org/gitlab-runner/helpers/docker"
......
......@@ -3,7 +3,7 @@ package common
import (
"context"
log "github.com/sirupsen/logrus"
log "github.com/Sirupsen/logrus"
)
type ExecutorData interface{}
......
......@@ -2,7 +2,7 @@ package common
import (
"fmt"
log "github.com/sirupsen/logrus"
log "github.com/Sirupsen/logrus"
"gitlab.com/gitlab-org/gitlab-runner/helpers"
)
......
......@@ -5,7 +5,7 @@ import (
"os"
"time"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
)
type machinesData struct {
......
......@@ -5,7 +5,7 @@ import (
"io/ioutil"
"time"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"gitlab.com/gitlab-org/gitlab-runner/helpers"
)
......
......@@ -4,7 +4,7 @@ import (
"errors"
"time"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"gitlab.com/gitlab-org/gitlab-runner/common"
......
......@@ -7,7 +7,7 @@ import (
"time"
"github.com/prometheus/client_golang/prometheus"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"gitlab.com/gitlab-org/gitlab-runner/common"
"gitlab.com/gitlab-org/gitlab-runner/helpers/docker"
......
......@@ -23,7 +23,7 @@ import (
"io"
"net/url"
log "github.com/sirupsen/logrus"
log "github.com/Sirupsen/logrus"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
remotecommandserver "k8s.io/apimachinery/pkg/util/remotecommand"
"k8s.io/client-go/kubernetes"
......
......@@ -14,7 +14,7 @@ import (
"testing"
"time"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
......
......@@ -4,7 +4,7 @@ import (
"os"
"testing"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"github.com/stretchr/testify/assert"
"gitlab.com/gitlab-org/gitlab-runner/common"
......
......@@ -10,7 +10,7 @@ import (
"fmt"
"github.com/kardianos/osext"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"gitlab.com/gitlab-org/gitlab-runner/common"
"gitlab.com/gitlab-org/gitlab-runner/executors"
"gitlab.com/gitlab-org/gitlab-runner/helpers"
......
......@@ -7,7 +7,7 @@ import (
"path/filepath"
"strings"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
)
func isPathAGitDirectory(path string) bool {
......
......@@ -7,7 +7,7 @@ import (
"os"
"path/filepath"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
)
func createZipDirectoryEntry(archive *zip.Writer, fh *zip.FileHeader) error {
......
......@@ -8,7 +8,7 @@ import (
"syscall"
"testing"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
......
......@@ -7,7 +7,7 @@ import (
"os"
"path/filepath"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
)
func extractZipDirectoryEntry(file *zip.File) (err error) {
......
......@@ -8,7 +8,7 @@ import (
"os"
"testing"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
......
......@@ -8,7 +8,7 @@ import (
"runtime"
"syscall"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
)
func watchForGoroutinesDump() {
......
package cli_helpers
import (
log "github.com/sirupsen/logrus"
log "github.com/Sirupsen/logrus"
"github.com/urfave/cli"
"os"
)
......
package cli_helpers
import (
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"gitlab.com/gitlab-org/gitlab-runner/helpers/url"
)
......
......@@ -4,7 +4,7 @@ import (
"bytes"
"testing"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"github.com/stretchr/testify/assert"
)
......
......@@ -5,7 +5,7 @@ import (
"gitlab.com/gitlab-org/gitlab-runner/common"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"github.com/urfave/cli"
)
......
......@@ -14,7 +14,7 @@ import (
"time"
"github.com/docker/machine/commands/mcndirs"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
)
type logWriter struct {
......
......@@ -10,7 +10,7 @@ import (
"github.com/docker/docker/api/types"
"github.com/docker/docker/client"
"github.com/docker/go-connections/tlsconfig"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"golang.org/x/net/context"
)
......
......@@ -4,7 +4,7 @@ import (
"fmt"
"io"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
)
type fatalLogHook struct {
......
......@@ -5,7 +5,7 @@ import (
"fmt"
"sort"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"gitlab.com/gitlab-org/gitlab-runner/helpers"
)
......
......@@ -7,7 +7,7 @@ import (
"bytes"
"errors"
"fmt"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"io/ioutil"
"os/exec"
"regexp"
......
......@@ -4,7 +4,7 @@ import (
"sync/atomic"
"github.com/prometheus/client_golang/prometheus"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
)
var numErrorsDesc = prometheus.NewDesc("ci_runner_errors", "The number of catched errors.", []string{"level"}, nil)
......
......@@ -4,7 +4,7 @@ import (
"testing"
"github.com/prometheus/client_golang/prometheus"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"github.com/stretchr/testify/assert"
)
......
......@@ -7,7 +7,7 @@ import (
"runtime"
"github.com/getsentry/raven-go"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"gitlab.com/gitlab-org/gitlab-runner/common"
)
......
......@@ -2,7 +2,7 @@ package service_helpers
import (
"github.com/ayufan/golang-kardianos-service"
log "github.com/sirupsen/logrus"
log "github.com/Sirupsen/logrus"
)
func New(i service.Interface, c *service.Config) (service.Service, error) {
......
......@@ -4,7 +4,7 @@ import (
"bytes"
"errors"
"fmt"
log "github.com/sirupsen/logrus"
log "github.com/Sirupsen/logrus"
"net"
"os"
"os/exec"
......
......@@ -4,7 +4,7 @@ import (
"os"
"path"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"github.com/urfave/cli"
"gitlab.com/gitlab-org/gitlab-runner/common"
"gitlab.com/gitlab-org/gitlab-runner/helpers/cli"
......
......@@ -22,7 +22,7 @@ import (
"time"
"github.com/jpillora/backoff"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"gitlab.com/gitlab-org/gitlab-runner/common"
)
......
......@@ -18,7 +18,7 @@ import (
"strconv"
"testing"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
......
......@@ -14,7 +14,7 @@ import (
"strconv"
"sync"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"gitlab.com/gitlab-org/gitlab-runner/common"
"gitlab.com/gitlab-org/gitlab-runner/helpers"
)
......
......@@ -12,7 +12,7 @@ import (
"github.com/minio/minio-go"
"github.com/sirupsen/logrus"
"github.com/Sirupsen/logrus"
"gitlab.com/gitlab-org/gitlab-runner/common"
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment