Skip to content
This repository has been archived by the owner on Apr 4, 2023. It is now read-only.

CRW-537 reorganize dockerfile steps so we can override patch and post-patch steps, such that generated tarball includes patched theia sources #571

Merged
merged 2 commits into from
Dec 4, 2019

Conversation

nickboldt
Copy link
Contributor

@nickboldt nickboldt commented Dec 2, 2019

CRW-537 reorganize dockerfile steps so we can override patch and post-patch steps, such that generated tarball includes patched theia sources

Change-Id: I3fdbfb5b46a13f0d3ce616d326181fc6763c3f3b
Signed-off-by: nickboldt nboldt@redhat.com

@che-bot
Copy link
Contributor

che-bot commented Dec 2, 2019

Can one of the admins verify this patch?

@nickboldt nickboldt changed the title CRW-537 if patches applied, tar up the... WIP: CRW-537 if patches applied, tar up the... Dec 2, 2019
@che-bot
Copy link
Contributor

che-bot commented Dec 2, 2019

✅ E2E Happy path tests succeed 🎉

Try Che-Theia editor only Try Che-Theia with Java/maven example Try Che-Theia with NodeJs example

See Details

name link
che-theia docker.io/maxura/che-theia:571
che-theia-endpoint-runtime-binary docker.io/maxura/che-theia-endpoint-runtime-binary:571

Tested with Eclipse Che Single User on K8S (minikube v1.1.1)

…on't have to repatch later.

move add+apply patch steps to new builder-patch-theia.dockerfile files; add builder-post-patch.dockerfile too
move tarball step from builder-clone-theia to builder-post-patch.dockerfile
add 'nothing to do on alpine' markers in empty files
add same comment in alpine and ubi8 versions of builder-clone-theia.dockerfile

Change-Id: I50c9380b5289d91f5ff7542c553c792572047c15
Signed-off-by: nickboldt <nboldt@redhat.com>
@nickboldt nickboldt changed the title WIP: CRW-537 if patches applied, tar up the... CRW-537 reorganize dockerfile steps so we can override patch and post-patch steps, such that generated tarball includes patched theia sources Dec 3, 2019
@che-bot
Copy link
Contributor

che-bot commented Dec 3, 2019

✅ E2E Happy path tests succeed 🎉

Try Che-Theia editor only Try Che-Theia with Java/maven example Try Che-Theia with NodeJs example

See Details

name link
che-theia docker.io/maxura/che-theia:571
che-theia-endpoint-runtime-binary docker.io/maxura/che-theia-endpoint-runtime-binary:571

Tested with Eclipse Che Single User on K8S (minikube v1.1.1)

…erfile

Change-Id: Id95ffd9e2c32155e68a0c236d49c148b77c4c2cf
Signed-off-by: nickboldt <nboldt@redhat.com>
@nickboldt nickboldt merged commit 069676f into eclipse-che:master Dec 4, 2019
@che-bot
Copy link
Contributor

che-bot commented Dec 4, 2019

❌ E2E Happy path tests failed ❗

Try Che-Theia editor only Try Che-Theia with Java/maven example Try Che-Theia with NodeJs example

See Details

name link
che-theia docker.io/maxura/che-theia:571
che-theia-endpoint-runtime-binary docker.io/maxura/che-theia-endpoint-runtime-binary:571

Tested with Eclipse Che Single User on K8S (minikube v1.1.1)

⚠️ https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

ℹ️ Use comment "crw-ci-test" to rerun happy path E2E test.

@ibuziuk ibuziuk mentioned this pull request Dec 4, 2019
21 tasks
nickboldt added a commit to nickboldt/che-theia that referenced this pull request Dec 4, 2019
…-patch steps, such that generated tarball includes patched theia sources (eclipse-che#571)

* CRW-537 if patches applied, tar up the results AFTER patching so we don't have to repatch later.
move add+apply patch steps to new builder-patch-theia.dockerfile files; add builder-post-patch.dockerfile too
move tarball step from builder-clone-theia to builder-post-patch.dockerfile
add 'nothing to do on alpine' markers in empty files
add same comment in alpine and ubi8 versions of builder-clone-theia.dockerfile

Change-Id: I50c9380b5289d91f5ff7542c553c792572047c15
Signed-off-by: nickboldt <nboldt@redhat.com>

* add newline to dockerfiles/theia/docker/ubi8/builder-clone-theia.dockerfile

Change-Id: Id95ffd9e2c32155e68a0c236d49c148b77c4c2cf
Signed-off-by: nickboldt <nboldt@redhat.com>
nickboldt added a commit that referenced this pull request Dec 4, 2019
…-patch steps, such that generated tarball includes patched theia sources (#571) (#577)

* CRW-537 if patches applied, tar up the results AFTER patching so we don't have to repatch later.
move add+apply patch steps to new builder-patch-theia.dockerfile files; add builder-post-patch.dockerfile too
move tarball step from builder-clone-theia to builder-post-patch.dockerfile
add 'nothing to do on alpine' markers in empty files
add same comment in alpine and ubi8 versions of builder-clone-theia.dockerfile

Change-Id: I50c9380b5289d91f5ff7542c553c792572047c15
Signed-off-by: nickboldt <nboldt@redhat.com>

* add newline to dockerfiles/theia/docker/ubi8/builder-clone-theia.dockerfile

Change-Id: Id95ffd9e2c32155e68a0c236d49c148b77c4c2cf
Signed-off-by: nickboldt <nboldt@redhat.com>
vinokurig pushed a commit that referenced this pull request Apr 6, 2021
New image has:
* Removed wget, used curl instead
* Fixed issue with oc missing from the container

See eclipse-che/che#17633

Signed-off-by: Eric Williams <ericwill@redhat.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants