| ... | ... |
@@ -173,7 +173,7 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ |
| 173 | 173 |
# Please edit hack/dockerfile/install-binaries.sh to update them. |
| 174 | 174 |
COPY hack/dockerfile/binaries-commits /tmp/binaries-commits |
| 175 | 175 |
COPY hack/dockerfile/install-binaries.sh /tmp/install-binaries.sh |
| 176 |
-RUN /tmp/install-binaries.sh tomlv vndr runc containerd tini proxy dockercli |
|
| 176 |
+RUN /tmp/install-binaries.sh tomlv vndr runc containerd tini proxy dockercli gometalinter |
|
| 177 | 177 |
ENV PATH=/usr/local/cli:$PATH |
| 178 | 178 |
|
| 179 | 179 |
# Wrap all commands in the "docker-in-docker" script to allow nested containers |
| ... | ... |
@@ -181,3 +181,6 @@ ENTRYPOINT ["hack/dind"] |
| 181 | 181 |
|
| 182 | 182 |
# Upload docker source |
| 183 | 183 |
COPY . /go/src/github.com/docker/docker |
| 184 |
+ |
|
| 185 |
+# Options for hack/validate/gometalinter |
|
| 186 |
+ENV GOMETALINTER_OPTS="--deadline 4m -j2" |
| ... | ... |
@@ -162,10 +162,13 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ |
| 162 | 162 |
# Please edit hack/dockerfile/install-binaries.sh to update them. |
| 163 | 163 |
COPY hack/dockerfile/binaries-commits /tmp/binaries-commits |
| 164 | 164 |
COPY hack/dockerfile/install-binaries.sh /tmp/install-binaries.sh |
| 165 |
-RUN /tmp/install-binaries.sh tomlv vndr runc containerd tini proxy dockercli |
|
| 165 |
+RUN /tmp/install-binaries.sh tomlv vndr runc containerd tini proxy dockercli gometalinter |
|
| 166 | 166 |
ENV PATH=/usr/local/cli:$PATH |
| 167 | 167 |
|
| 168 | 168 |
ENTRYPOINT ["hack/dind"] |
| 169 | 169 |
|
| 170 | 170 |
# Upload docker source |
| 171 | 171 |
COPY . /go/src/github.com/docker/docker |
| 172 |
+ |
|
| 173 |
+# Options for hack/validate/gometalinter |
|
| 174 |
+ENV GOMETALINTER_OPTS="--deadline 10m -j2" |
| ... | ... |
@@ -160,7 +160,7 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ |
| 160 | 160 |
# Please edit hack/dockerfile/install-binaries.sh to update them. |
| 161 | 161 |
COPY hack/dockerfile/binaries-commits /tmp/binaries-commits |
| 162 | 162 |
COPY hack/dockerfile/install-binaries.sh /tmp/install-binaries.sh |
| 163 |
-RUN /tmp/install-binaries.sh tomlv vndr runc containerd tini proxy dockercli |
|
| 163 |
+RUN /tmp/install-binaries.sh tomlv vndr runc containerd tini proxy dockercli gometalinter |
|
| 164 | 164 |
ENV PATH=/usr/local/cli:$PATH |
| 165 | 165 |
|
| 166 | 166 |
# Wrap all commands in the "docker-in-docker" script to allow nested containers |
| ... | ... |
@@ -153,7 +153,7 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ |
| 153 | 153 |
# Please edit hack/dockerfile/install-binaries.sh to update them. |
| 154 | 154 |
COPY hack/dockerfile/binaries-commits /tmp/binaries-commits |
| 155 | 155 |
COPY hack/dockerfile/install-binaries.sh /tmp/install-binaries.sh |
| 156 |
-RUN /tmp/install-binaries.sh tomlv vndr runc containerd tini proxy dockercli |
|
| 156 |
+RUN /tmp/install-binaries.sh tomlv vndr runc containerd tini proxy dockercli gometalinter |
|
| 157 | 157 |
ENV PATH=/usr/local/cli:$PATH |
| 158 | 158 |
|
| 159 | 159 |
# Wrap all commands in the "docker-in-docker" script to allow nested containers |
| ... | ... |
@@ -157,9 +157,10 @@ func copyDir(srcDir, dstDir string, flags copyFlags) error {
|
| 157 | 157 |
} |
| 158 | 158 |
|
| 159 | 159 |
// system.Chtimes doesn't support a NOFOLLOW flag atm |
| 160 |
+ // nolint: unconvert |
|
| 160 | 161 |
if !isSymlink {
|
| 161 |
- aTime := time.Unix(stat.Atim.Sec, stat.Atim.Nsec) |
|
| 162 |
- mTime := time.Unix(stat.Mtim.Sec, stat.Mtim.Nsec) |
|
| 162 |
+ aTime := time.Unix(int64(stat.Atim.Sec), int64(stat.Atim.Nsec)) |
|
| 163 |
+ mTime := time.Unix(int64(stat.Mtim.Sec), int64(stat.Mtim.Nsec)) |
|
| 163 | 164 |
if err := system.Chtimes(dstPath, aTime, mTime); err != nil {
|
| 164 | 165 |
return err |
| 165 | 166 |
} |
| ... | ... |
@@ -3,4 +3,9 @@ set -e -o pipefail |
| 3 | 3 |
|
| 4 | 4 |
SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
| 5 | 5 |
|
| 6 |
-gometalinter --config $SCRIPTDIR/gometalinter.json ./... |
|
| 6 |
+# CI platforms differ, so per-platform GOMETALINTER_OPTS can be set |
|
| 7 |
+# from a platform-specific Dockerfile, otherwise let's just set |
|
| 8 |
+# (somewhat pessimistic) default of 10 minutes. |
|
| 9 |
+gometalinter \ |
|
| 10 |
+ ${GOMETALINTER_OPTS:--deadine 10m} \
|
|
| 11 |
+ --config $SCRIPTDIR/gometalinter.json ./... |