Skip to content

Dockerfile changes for OpenShift - #125

Merged
spadgett merged 1 commit into
openshift:masterfrom
spadgett:multi-stage-dockerfile
Jun 19, 2018
Merged

Dockerfile changes for OpenShift#125
spadgett merged 1 commit into
openshift:masterfrom
spadgett:multi-stage-dockerfile

Conversation

@spadgett

@spadgett spadgett commented Jun 12, 2018

Copy link
Copy Markdown
Member
  • Use openshift/origin-base as the base image
  • Add image labels and user

/cc @adammhaile @jwforres

@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 12, 2018
@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jun 12, 2018
@spadgett

Copy link
Copy Markdown
Member Author

jenkins push

@coreos-ui

Copy link
Copy Markdown

The PR image has been pushed to Quay with tag pr_125_build_369

@spadgett
spadgett force-pushed the multi-stage-dockerfile branch from 771b48b to 299cd61 Compare June 12, 2018 19:57
@spadgett

Copy link
Copy Markdown
Member Author

jenkins push

Comment thread Dockerfile Outdated

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.

Interesting, is our own base image a new thing?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

It's used by a few other components and OpenShift CI for builds.

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Note... we don't actually ever build with this image as a base. It will be replaced with openshift3/ose-base in our process.
If you need this to also build in origin, then what you have is definitely the way to go. However, I am concerned about the golang-1.9 tag. That's not something I'm familiar with. We build openshift3/ose-base during the OCP build so that version will be what this image is built with.

@spadgett spadgett Jun 13, 2018

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

This is a multistage build. The first image is only used for building the Go binary.

https://docs.docker.com/develop/develop-images/multistage-build/

We have FROM openshift/origin-base later. Does the tooling support that?

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.

It doesn't yet, but this will be a guinea pig for that capability in OSBS.

@coreos-ui

Copy link
Copy Markdown

The PR image has been pushed to Quay with tag pr_125_build_371

@spadgett spadgett changed the title [WIP] Dockerfile changes for OpenShift Dockerfile changes for OpenShift Jun 12, 2018
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 12, 2018
@spadgett

Copy link
Copy Markdown
Member Author

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 13, 2018
@stevekuznetsov

Copy link
Copy Markdown

/test backend

@spadgett
spadgett force-pushed the multi-stage-dockerfile branch 3 times, most recently from b360baa to c0cd76a Compare June 18, 2018 17:59
@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 18, 2018
@spadgett
spadgett force-pushed the multi-stage-dockerfile branch from c0cd76a to f7a4ac4 Compare June 18, 2018 18:15
@spadgett

Copy link
Copy Markdown
Member Author

@stevekuznetsov This now adds a Dockerfile.ci, but I'm not sure it should be needed looking at

https://github.com/openshift/release/blob/master/ci-operator/config/openshift/console/master.json

ci/prow/* jobs are failing, though.

@stevekuznetsov

Copy link
Copy Markdown

ci/prow/ jobs should be fixed by openshift/ci-operator#25

@spadgett
spadgett force-pushed the multi-stage-dockerfile branch from f7a4ac4 to 6968a70 Compare June 19, 2018 13:15
@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 19, 2018
* Use openshift/origin-base as the base image
* Add image labels and user
@spadgett
spadgett force-pushed the multi-stage-dockerfile branch from 6968a70 to 5b687af Compare June 19, 2018 13:16
@spadgett

Copy link
Copy Markdown
Member Author

OK, I've updated this PR just to switch the base image and add labels and user.

@spadgett

Copy link
Copy Markdown
Member Author

jenkins push

@coreos-ui

Copy link
Copy Markdown

The PR image has been pushed to Quay with tag pr_125_build_385

@spadgett

Copy link
Copy Markdown
Member Author

I updated the CI cluster with an image built from this Dockerfile.

@jwforres PTAL

@stevekuznetsov

Copy link
Copy Markdown

/test all

@openshift-ci-robot

openshift-ci-robot commented Jun 19, 2018

Copy link
Copy Markdown
Contributor

@spadgett: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/prow/crud 5b687af link /test crud
ci/prow/alm 5b687af link /test alm
ci/prow/performance 5b687af link /test performance
Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@jwforres

Copy link
Copy Markdown
Member

LGTM for first pass to switch base image

@spadgett

Copy link
Copy Markdown
Member Author

I'll work on any changes needed for OSBS in a follow on.

@spadgett
spadgett merged commit 782ef2d into openshift:master Jun 19, 2018
@spadgett
spadgett deleted the multi-stage-dockerfile branch June 19, 2018 18:37
christianvogt pushed a commit to christianvogt/console that referenced this pull request Jun 11, 2019
* add AddLabel option component

* fix import and props type variable name

* add props to pass back the value to component and use name-value-editor component

* move component to shared component folder
TimothyAsirJeyasing pushed a commit to TimothyAsirJeyasing/console that referenced this pull request Aug 3, 2022
…ice-dashboard

Add object-service-dashboard test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants