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

Switch demo to use version 2 of the Docker registry #71

Merged
merged 1 commit into from Oct 5, 2016

Conversation

Projects
None yet
4 participants
@jglick
Copy link
Member

commented Oct 3, 2016

Mentioned in JENKINS-38018. We should be testing against the latest version of the Registry. This includes built-in SSL and authentication, so we do not need to proxy with nginx.

@reviewbybees

@@ -37,6 +37,9 @@ RUN /usr/local/maven/bin/mvn -s settings.xml -Dmaven.repo.local=/usr/share/jenki
COPY plugins.txt /tmp/files/
RUN /usr/local/bin/plugins.sh /tmp/files/plugins.txt

# Remove the base workflow-demo "cd" job
RUN rm -rf /usr/share/jenkins/ref/jobs/cd

This comment has been minimized.

Copy link
@jglick

jglick Oct 3, 2016

Author Member

Did not belong in run-demo.sh to begin with.

build-proxy:
docker build -t nginx:docker-workflow-demo -f Dockerfile-proxy .
build-registry:
./gen-security-data.sh certs

This comment has been minimized.

Copy link
@jglick

jglick Oct 3, 2016

Author Member

Logically would belong in Dockerfile-registry, but the registry image does not seem to contain an openssl binary.

Alternately, could check in a static *.crt + *.key.

@reviewbybees

This comment has been minimized.

Copy link

commented Oct 4, 2016

This pull request originates from a CloudBees employee. At CloudBees, we require that all pull requests be reviewed by other CloudBees employees before we seek to have the change accepted. If you want to learn more about our process please see this explanation.

@stephenc

This comment has been minimized.

Copy link
Member

commented Oct 5, 2016

🐝 AIUI

@oleg-nenashev

This comment has been minimized.

Copy link
Member

commented Oct 5, 2016

🐝

@jglick jglick merged commit 77241fc into jenkinsci:master Oct 5, 2016

1 check passed

Jenkins This pull request looks good
Details

@jglick jglick deleted the jglick:registry-2 branch Oct 5, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.