Skip to content

feat(regsitry): Add support for private registry#81

Merged
kmala merged 1 commit intodeis:masterfrom
kmala:storage
Jul 29, 2016
Merged

feat(regsitry): Add support for private registry#81
kmala merged 1 commit intodeis:masterfrom
kmala:storage

Conversation

@kmala
Copy link
Copy Markdown
Contributor

@kmala kmala commented Jul 21, 2016

No description provided.

@deis-bot
Copy link
Copy Markdown

@mboersma, @smothiki and @krancour are potential reviewers of this pull request based on my analysis of git blame information. Thanks @kmala!

Comment thread rootfs/Dockerfile Outdated
--no-install-recommends \
&& curl -sSL https://bootstrap.pypa.io/get-pip.py | python - pip==8.1.1 \
&& pip install --disable-pip-version-check --no-cache-dir docker-py==1.8.1 \
&& pip install --disable-pip-version-check --no-cache-dir git+https://github.com/kmala/docker-py.git@56016b806cd730d3de74712c161f57208e7473f7 \
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

this will be changed before merging once docker/docker-py#1133 is merged.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Did this get included in docker-py 1.9?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

No..they tagged it for 1.10...i am thinking of building from commit..what do you say?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Go for it

Comment thread rootfs/Dockerfile
--no-install-recommends \
&& curl -sSL https://bootstrap.pypa.io/get-pip.py | python - pip==8.1.1 \
&& pip install --disable-pip-version-check --no-cache-dir docker-py==1.8.1 \
&& pip install --disable-pip-version-check --no-cache-dir git+https://github.com/docker/docker-py.git@9b63bed6a0b5185b043e85df8c49d86d2c048aa1 \
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

any way we can just run off v1.8.1 with your patch instead of off a dev release of docker-py? Maybe even just bump to v1.9.0?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

we can do a docker login and then do docker push but that would mean we are populating the credentials onto the cluster hosts and i am not sure how it will behave when two concurrent pushes happen.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

?

I'm just talking about changing this line to use docker-py 1.9.0. Is there some background context I'm missing that's blocking us from upgrading straight to 1.9.0 which includes your patch?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

My patch is not in 1.9.0...it will be present in 1.10.0.
docker/docker-py#1133 (comment)

@bacongobbler
Copy link
Copy Markdown
Member

Every time I see more code dumped into deploy.py, the more I feel like we need some unit tests for dockerbuilder. In my eyes deploy.py is starting to become its own project at this point.

Comment thread rootfs/deploy.py Outdated
}
return client.push(repo, tag=tag, stream=True, auth_config=auth_config)
else:
return client.push(repo, tag=tag, stream=True, insecure_registry=True)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Do we need the insecure_registry portion here anymore given the work @bacongobbler did?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@bacongobbler needs to do more PR's in the dockerbuilder and controller before it works fully where DEIS_REGISTRY_SERVICE_HOST and DEIS_REGISTRY_SERVICE_PORT should be changed.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Ah - I did a PR that pulls out some of insecure_registry stuff but not fixing the env vars in Controller deis/controller#933

Copy link
Copy Markdown
Member

@bacongobbler bacongobbler Jul 29, 2016

Choose a reason for hiding this comment

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

for what it's worth, deis pull and dockerfile builds work just fine on workflow-dev for me as well as for aaron and jack when they reviewed it manually. If you're finding different results then please file a bug and bring it to my attention.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I just wanted to clean up that code is all :D

@helgi helgi mentioned this pull request Jul 29, 2016
@kmala kmala merged commit 4090625 into deis:master Jul 29, 2016
@kmala kmala deleted the storage branch July 29, 2016 19:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants