Add Dockerfiles.centos7 and job-id files for CentOS image building #9864

tdawson · 2016-07-14T21:26:21Z

These files should not interfere with any non-CentOS work.
They make it possible to build OpenShift Origin images in CentOS's enviroment.

sdodson · 2016-07-15T15:17:55Z

Is there anyway that we can merge .centos7 and .rhel7 files in some way to keep from having 3 Dockerfiles for each image? Or at least we should make sure that the two differ as little as possible other than the top level base image.

tdawson · 2016-07-15T15:23:40Z

@sdodson the .rhel7 and .centos7 have different image names. If anything, we might be able to whittle this down to only have Dockerfile.centos7 images when it varies from the main Dockerfile.

@mohammedzee1000 could the CentOS image build system check to see if there is a Dockerfile.centos7 file and use that, otherwise use the plain Dockerfile?

brenton · 2016-07-15T15:27:37Z

LGTM. @smarterclayton, are you OK with these new .centos7 Dockerfiles?

smarterclayton · 2016-07-15T19:23:18Z

Yes, ok with them but I want to make sure someone is on the hook to test them and keep them current

tdawson · 2016-07-15T20:09:07Z

That would be me and/or @mohammedzee1000.
I'm already doing a Monday, Wed, Fri check to see if the normal Dockerfiles change, so I am the logical choice for now.

kbsingh · 2016-07-15T20:21:22Z

@tdawson For builds that dont need a custom / changed Dockerfile, just skip adding in the .centos7 ones, and we can directly reference the Dockerfile there.

tdawson · 2016-07-15T20:41:12Z

@kbsingh That sounds like a plan, that will save alot of space and work. I'll update this pull request with the duplicate Dockerfiles removed.

tdawson · 2016-07-15T21:02:21Z

That looks better.

tdawson · 2016-07-15T21:09:25Z

Does anyone mind giving this a merge?

smarterclayton · 2016-07-15T21:25:32Z

images/node/Dockerfile.centos7

+
+COPY scripts/* /usr/local/bin/
+
+RUN INSTALL_PKGS="origin-sdn-ovs libmnl libnetfilter_conntrack openvswitch \


How big is origin-SDN-OVS? If nothing else changes I would just put this in Openshift/origin and that's one less image

origin-sdn-ovs itself is a few KiB, but it pulls in openvswitch and all of its dependencies. openshift3/node is 689.1MB, openshift/ose is 483.1MB.

We depend on BSDTAR for builders, which take a tar, tar.gz, tar.zip, or tar.bz input. Regular TAR can't handle that.

tdawson · 2016-07-18T20:07:52Z

Changed the released Dockerfile to ensure that bsdtar is installed.

smarterclayton · 2016-07-18T20:21:42Z

images/release/Dockerfile

@@ -15,7 +15,7 @@ ENV VERSION=1.6 \
 ENV PATH=$PATH:$GOROOT/bin:$GOPATH/bin

 RUN mkdir $TMPDIR && \
-    INSTALL_PKGS="make gcc zip mercurial krb5-devel" && \


Changes to the release dockerfile need to be replicated to all the specific sub versions.

tdawson · 2016-07-18T21:57:06Z

All release/Dockerfile and release/*/Dockerfile ensure that bsdtar is installed.
removed enabling centosplus repo from custom-docker-builder, enabling me to remove the Dockerfile.centos7 from there.

smarterclayton · 2016-07-18T22:37:26Z

[test]

mohammedzee1000 · 2016-07-19T08:37:58Z

@tdawson Hey, yes there is an entry in the index called target-file, where you can specify a filename, and if that is not specified, it falls back to using Dockerfile.

tdawson · 2016-07-19T13:22:45Z

[test]

tdawson · 2016-07-19T16:03:19Z

Those failures look like some type of networking issue ... testing again.

tdawson · 2016-07-19T16:03:25Z

[test]

tdawson · 2016-07-19T19:43:44Z

Looking at other jobs, it looks like all tests (not just this pull request) are failing today on test_pull_requests_origin_integration and test_pull_requests_origin_conformance

smarterclayton · 2016-07-19T21:47:20Z

Yes, AWS is blowed up.

On Tue, Jul 19, 2016 at 3:43 PM, Troy Dawson notifications@github.com
wrote:

Looking at other jobs, it looks like all tests (not just this pull
request) are failing today on test_pull_requests_origin_integration and
test_pull_requests_origin_conformance

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#9864 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/ABG_p2TKCRx0RB73DjPoT1M_y2Bh7d8Mks5qXSjygaJpZM4JM3e8
.

tdawson · 2016-07-20T20:21:09Z

[test]

tdawson · 2016-07-21T19:33:56Z

[test]

tdawson · 2016-07-21T21:36:09Z

I really cannot tell if the test failures are because of this pull request or not. It keeps failling in the same section, but it seems to have a different failure each time.
Can someone look at the failures to determine if we've broken anything.
If not, can we get a merge?

smarterclayton · 2016-07-22T01:07:42Z

It's not broken, but this is behind another flake reducing PR we're trying
to land. Please stand by

On Jul 21, 2016, at 5:36 PM, Troy Dawson notifications@github.com wrote:

I really cannot tell if the test failures are because of this pull request
or not. It keeps failling in the same section, but it seems to have a
different failure each time.
Can someone look at the failures to determine if we've broken anything.
If not, can we get a merge?

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#9864 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/ABG_p3TYv0FufH8Y2c4VvMp5l6fkx4jZks5qX-ZLgaJpZM4JM3e8
.

smarterclayton · 2016-07-22T03:43:36Z

Ok, the other PR merged - be aware that openvswitch changed its from image.

On Thu, Jul 21, 2016 at 9:07 PM, Clayton Coleman ccoleman@redhat.com
wrote:

It's not broken, but this is behind another flake reducing PR we're trying
to land. Please stand by

On Jul 21, 2016, at 5:36 PM, Troy Dawson notifications@github.com wrote:

I really cannot tell if the test failures are because of this pull request
or not. It keeps failling in the same section, but it seems to have a
different failure each time.
Can someone look at the failures to determine if we've broken anything.
If not, can we get a merge?

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#9864 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/ABG_p3TYv0FufH8Y2c4VvMp5l6fkx4jZks5qX-ZLgaJpZM4JM3e8
.

Add CentOS job-id files Add Dockerfile.centos7 files Remove Dockerfile.centos7 files when they are the same as Dockerfile Put relavent centos changes into plain Dockerfiles Ensure bsdtar is installed We no longer need centosplus enabled Remove Dockerfile.centos7 for openvswitch

tdawson · 2016-07-22T13:22:20Z

Awesome, looks like one less Dockerfile.centos7 file needed.

tdawson · 2016-07-26T19:11:37Z

[test]

openshift-bot · 2016-07-26T19:15:41Z

Evaluated for origin test up to 987b601

openshift-bot · 2016-07-26T20:31:50Z

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/6927/)

tdawson · 2016-07-26T20:46:58Z

I think we've taken care of all the problems, and the tests have finally passed. Can we get a merge while the tests are still working?

tdawson · 2016-07-27T15:13:59Z

[merge]

openshift-bot · 2016-07-27T15:15:32Z

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/6989/) (Image: devenv-rhel7_4685)

openshift-bot · 2016-07-27T15:15:32Z

Evaluated for origin merge up to 987b601

tdawson force-pushed the 2016-07-dockerfile.centos-1.3 branch from a9889d1 to 5c53722 Compare July 15, 2016 20:53

smarterclayton reviewed Jul 15, 2016
View reviewed changes

tdawson force-pushed the 2016-07-dockerfile.centos-1.3 branch 2 times, most recently from d1c9bcf to 943e562 Compare July 18, 2016 20:05

smarterclayton reviewed Jul 18, 2016
View reviewed changes

tdawson force-pushed the 2016-07-dockerfile.centos-1.3 branch 2 times, most recently from 8db071b to 80b8bc8 Compare July 18, 2016 21:54

mohammedzee1000 mentioned this pull request Jul 19, 2016

Added entries for origin containers. CentOS/container-index#7

Merged

tdawson force-pushed the 2016-07-dockerfile.centos-1.3 branch from 80b8bc8 to 987b601 Compare July 22, 2016 13:21

openshift-bot merged commit bf6e9dd into openshift:master Jul 27, 2016

tdawson mentioned this pull request Nov 30, 2016

Create cccp.yaml files for the dockerfiles in the images directory. #8451

Closed


		COPY scripts/* /usr/local/bin/

		RUN INSTALL_PKGS="origin-sdn-ovs libmnl libnetfilter_conntrack openvswitch \

Add Dockerfiles.centos7 and job-id files for CentOS image building #9864

Add Dockerfiles.centos7 and job-id files for CentOS image building #9864

Conversation

tdawson commented Jul 14, 2016

sdodson commented Jul 15, 2016 • edited Loading

tdawson commented Jul 15, 2016

brenton commented Jul 15, 2016

smarterclayton commented Jul 15, 2016

tdawson commented Jul 15, 2016

kbsingh commented Jul 15, 2016

tdawson commented Jul 15, 2016

tdawson commented Jul 15, 2016

tdawson commented Jul 15, 2016

smarterclayton Jul 15, 2016

Choose a reason for hiding this comment

sdodson Jul 17, 2016

Choose a reason for hiding this comment

smarterclayton Jul 18, 2016 via email

Choose a reason for hiding this comment

tdawson commented Jul 18, 2016

smarterclayton Jul 18, 2016

Choose a reason for hiding this comment

tdawson commented Jul 18, 2016

smarterclayton commented Jul 18, 2016

mohammedzee1000 commented Jul 19, 2016

tdawson commented Jul 19, 2016

tdawson commented Jul 19, 2016

tdawson commented Jul 19, 2016

tdawson commented Jul 19, 2016

smarterclayton commented Jul 19, 2016

tdawson commented Jul 20, 2016

tdawson commented Jul 21, 2016

tdawson commented Jul 21, 2016

smarterclayton commented Jul 22, 2016

smarterclayton commented Jul 22, 2016

tdawson commented Jul 22, 2016

tdawson commented Jul 26, 2016

openshift-bot commented Jul 26, 2016

openshift-bot commented Jul 26, 2016

tdawson commented Jul 26, 2016

tdawson commented Jul 27, 2016

openshift-bot commented Jul 27, 2016 • edited Loading

openshift-bot commented Jul 27, 2016

sdodson commented Jul 15, 2016 •

edited

Loading

openshift-bot commented Jul 27, 2016 •

edited

Loading