Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stop using dockerfile/* images #6917

Merged
merged 1 commit into from
Apr 16, 2015

Conversation

thockin
Copy link
Member

@thockin thockin commented Apr 16, 2015

As per
http://blog.docker.com/2015/03/updates-available-to-popular-repos-update-your-images/
docker has stopped answering dockerfile/redis and dockerfile/nginx. Fix all
users in our tree. Sadly this means a lot of published examples are now broken.

I don't know why they didn't just make these aliases to their replacements. Sigh.

Fixes #6914

@thockin
Copy link
Member Author

thockin commented Apr 16, 2015

Please review carefully - this was done mostly mechanically.

@thockin
Copy link
Member Author

thockin commented Apr 16, 2015

Running e2e now

@a-robinson
Copy link
Contributor

It looks like this breaks the unit tests

--- FAIL: TestReadme (0.10s)
    examples_test.go:262: ../examples/walkthrough/README.md did not validate correctly: [spec.containers[0].image: required value]
    examples_test.go:247: skipping (yaml): 
        ...
            volumes:
              - name: redis-persistent-storage
                source:
                  emptyDir: {}
        ...
    examples_test.go:247: skipping (yaml): 
        ...
                volumeMounts:
                    # name must match the volume name below
                  - name: redis-persistent-storage
                    # mount path within the container
                    mountPath: /data/redis
        ...
FAIL
coverage: 0.0% of statements
FAIL    github.com/GoogleCloudPlatform/kubernetes/examples  0.587s

@a-robinson a-robinson self-assigned this Apr 16, 2015
@thockin thockin force-pushed the dockerfile-images-are-dead branch from 68150bc to be135cb Compare April 16, 2015 18:13
@thockin
Copy link
Member Author

thockin commented Apr 16, 2015

The regex for extracting sample code was broken. Fixed in newest push, starting e2e now

@thockin
Copy link
Member Author

thockin commented Apr 16, 2015

@smarterclayton for regex and related comment

@@ -217,7 +217,7 @@ Once the docker image for nginx has been downloaded, the container will start an
$ sudo salt '*minion-1' cmd.run 'docker ps'
kubernetes-minion-1:
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
dbe79bf6e25b dockerfile/nginx:latest "nginx" 21 seconds ago Up 19 seconds k8s--mynginx.8c5b8a3a--7813c8bd_-_3ffe_-_11e4_-_9036_-_0800279696e1.etcd--7813c8bd_-_3ffe_-_11e4_-_9036_-_0800279696e1--fcfa837f
dbe79bf6e25b nginx :latest "nginx" 21 seconds ago Up 19 seconds k8s--mynginx.8c5b8a3a--7813c8bd_-_3ffe_-_11e4_-_9036_-_0800279696e1.etcd--7813c8bd_-_3ffe_-_11e4_-_9036_-_0800279696e1--fcfa837f
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The spacing got put in the wrong spot :)

@a-robinson
Copy link
Contributor

LGTM other than the one messed up line. Thanks for adding comments to the regex!

As per
http://blog.docker.com/2015/03/updates-available-to-popular-repos-update-your-images/
docker has stopped answering dockerfile/redis and dockerfile/nginx.  Fix all
users in our tree.  Sadly this means a lot of published examples are now broken.
@thockin thockin force-pushed the dockerfile-images-are-dead branch from be135cb to c2bacd5 Compare April 16, 2015 19:21
@thockin
Copy link
Member Author

thockin commented Apr 16, 2015

fixed the messed up line, e2e is still running

@smarterclayton
Copy link
Contributor

Looks fine to me.

@thockin
Copy link
Member Author

thockin commented Apr 16, 2015

e2e SUCCESS!

a-robinson added a commit that referenced this pull request Apr 16, 2015
@a-robinson a-robinson merged commit 391e079 into kubernetes:master Apr 16, 2015
@thockin thockin deleted the dockerfile-images-are-dead branch June 25, 2015 04:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Urgent: update all our examples to use "official" docker images
4 participants