Update import path from docker/docker to moby/moby#35361
Update import path from docker/docker to moby/moby#35361cpuguy83 wants to merge 1 commit intomoby:masterfrom
Conversation
There was a problem hiding this comment.
Gogland did this automatically for me (I think it runs goimports) but some imports may need to be re-sorted after the rename
There was a problem hiding this comment.
go fmt'd everything on the last push.
There was a problem hiding this comment.
Yes, we need to run gofmt on all the files that got modified.
There was a problem hiding this comment.
gofmt should be sufficient in this case.
f0e10d5 to
a71ca1a
Compare
|
|
Not sure what happened on Janky though; related to the autogen changes? |
|
It did that before as well. I'm trying to track it down, could be related
to the CI script.
…On Wed, Nov 1, 2017 at 5:04 PM, Sebastiaan van Stijn < ***@***.***> wrote:
Not sure what happened on Janky though; related to the autogen changes?
20:52:27 Successfully built ebffcb9dca5e
20:52:27 fatal: Not a git repository (or any of the parent directories): .git
20:52:27 Build step 'Execute shell' marked build as failure
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#35361 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AAwxZqhdPiEmEBf-M0dt-mnnje5B1gxyks5syNzYgaJpZM4QObZR>
.
--
- Brian Goff
|
|
Yep:
```
#!/bin/bash
set -e
# todo: include ip_vs in base image
sudo modprobe ip_vs
# checkout the PR
git fetch origin +refs/pull/$PR/head:refs/remotes/origin/pr/$PR
git merge origin/pr/$PR
GITCOMMIT=$(git rev-parse --short HEAD)
export CODECOV_TOKEN="e6d53b86-8efe-4b59-adb0-c205a735b39e"
docker build --rm --force-rm --build-arg APT_MIRROR=
cdn-fastly.deb.debian.org -t docker:$GITCOMMIT .
docker run --rm -t --privileged \
-v "$WORKSPACE/bundles:/go/src/github.com/docker/docker/bundles" \
-v "$WORKSPACE/.git:/go/src/github.com/docker/docker/.git" \
--name docker-pr$BUILD_NUMBER \
-e DOCKER_GITCOMMIT=${GITCOMMIT} \
-e DOCKER_GRAPHDRIVER=vfs \
-e DOCKER_EXECDRIVER=native \
-e CODECOV_TOKEN \
-e GIT_SHA1 \
docker:$GITCOMMIT \
hack/ci/janky
```
|
a71ca1a to
379ad24
Compare
This is part of the effort to migrate from docker/docker to moby/moby. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
379ad24 to
a7e793e
Compare
|
Vendor forks done. |
|
This is going to either break or cause annoyance to every project that vendors |
|
@cyphar There are a couple of places where this is especially difficult... specifically api/types/ and client/. The rest of the repo is not generally considered stable from a package API standpoint (and I'm sure we've done a poor job in keeping the types and client package API's totally stable). But yes, definitely aware this is going to cause problems. I think with enough for-warning it won't be so bad, however it is difficult to prepare a repo for this change since someone can't just gradually make this change or even switch to new imports now rather than after the change (e.g. like they could for when grpc changed repos). |
|
@cyphar Just a reminder that the logrus change was problematic due to casing. One could not have |
|
@cpuguy83 what is the status for this one ? (you have soooo much conflicts 🤗) |
|
Given the PR on canonical import : #36194 should we close this one for now ? |
|
Yeah, fine closing this now. |
This is part of the effort to migrate from docker/docker to moby/moby.
This will have an impact on people who consume this repo. We should have a communication plan for this change (moby blog post?).
If you can think of other todo's outside of communication, please comment.