Skip to content
This repository has been archived by the owner on Jun 18, 2022. It is now read-only.

Commit

Permalink
Merge pull request #286 from alena1108/dec31
Browse files Browse the repository at this point in the history
Update golint and go version
  • Loading branch information
Alena Prokharchyk authored Dec 31, 2018
2 parents 5b33ac7 + c0ea5de commit b32b1e7
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions Dockerfile.dapper
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
FROM golang:1.8.3
FROM golang:1.10.3
RUN apt-get update && \
apt-get install -y uuid-runtime iptables zip
RUN go get github.com/rancher/trash
RUN go get golang.org/x/lint/golint
RUN go get github.com/rancher/trash && go get golang.org/x/lint/golint
ARG DOCKER_VERSION=1.10.3
RUN if [ "${DOCKER_VERSION}" = "1.10.3" ]; then \
curl -sL https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION} > /usr/bin/docker && \
Expand Down
2 changes: 1 addition & 1 deletion core/compute/compute_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ func setupDeviceOptionsTest(hostConfig *container.HostConfig, instance *model.In
if dev == "DEFAULT_DISK" {
dev = mockDevice
if dev == "" {
log.Warn(fmt.Sprintf("Couldn't find default device. Not setting device options: %s", options))
log.Warn(fmt.Sprintf("Couldn't find default device. Not setting device options: %v", options))
continue
}
}
Expand Down
2 changes: 1 addition & 1 deletion core/compute/compute_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ func setupDeviceOptions(hostConfig *container.HostConfig, instance model.Instanc
// ignore this error because if we can't find the device we just skip that device
dev, _ = hostinfo.GetDefaultDisk(infoData)
if dev == "" {
log.Warn(fmt.Sprintf("Couldn't find default device. Not setting device options: %s", options))
log.Warn(fmt.Sprintf("Couldn't find default device. Not setting device options: %v", options))
continue
}
}
Expand Down

0 comments on commit b32b1e7

Please sign in to comment.