Skip to content

Commit

Permalink
Define 'command' and/or 'args' as needed in test Devfiles
Browse files Browse the repository at this point in the history
Otherwise, the default images used spwan containers that terminate right away,
which would prevent us from using the new '--no-supervisord' flag.

This has no impact when running with Supervisord,
because [1] introduced a workaround this that always
overrides the container entrypoint.

[1] redhat-developer#5620
  • Loading branch information
rm3l committed May 30, 2022
1 parent e3aae7a commit 88e0c73
Show file tree
Hide file tree
Showing 34 changed files with 76 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ components:
- name: http-3000
targetPort: 3000
image: registry.access.redhat.com/ubi8/nodejs-16-minimal:latest
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
mountSources: true
sourceMapping: $PROJECT_SOURCE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ components:
- name: http-3000
targetPort: 3000
image: registry.access.redhat.com/ubi8/nodejs-14:latest
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
mountSources: true
sourceMapping: /project
Expand Down
2 changes: 2 additions & 0 deletions tests/examples/source/devfiles/nodejs/devfile-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ components:
- name: http-3000
targetPort: 3000
image: registry.access.redhat.com/ubi8/nodejs-14:latest
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
mountSources: true
sourceMapping: /project
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ components:
- name: http-3000
targetPort: 3000
image: registry.access.redhat.com/ubi8/nodejs-14:latest
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
mountSources: true
sourceMapping: /project
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ components:
- name: http-3000
targetPort: 3000
image: registry.access.redhat.com/ubi8/nodejs-14:latest
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
mountSources: true
name: runtime
Expand Down
2 changes: 2 additions & 0 deletions tests/examples/source/devfiles/nodejs/devfile-outerloop.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ components:
- name: http-3000
targetPort: 3000
image: registry.access.redhat.com/ubi8/nodejs-14:latest
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
mountSources: true
sourceMapping: /project
Expand Down
2 changes: 2 additions & 0 deletions tests/examples/source/devfiles/nodejs/devfile-registry.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ components:
- name: http-3000
targetPort: 3000
image: registry.access.redhat.com/ubi8/nodejs-14:latest
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
mountSources: true
sourceMapping: /project
Expand Down
2 changes: 2 additions & 0 deletions tests/examples/source/devfiles/nodejs/devfile-variables.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ components:
- name: runtime
container:
image: registry.access.redhat.com/ubi8/nodejs-12:1-36
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 100Mi
endpoints:
- name: "3000-tcp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ components:
- name: runtime
container:
image: registry.access.redhat.com/ubi8/nodejs-12:1-36
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
memoryRequest: 550Mi
cpuLimit: 700m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ components:
- name: runtime
container:
image: registry.access.redhat.com/ubi8/nodejs-12:1-36
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
memoryRequest: 512Mi
cpuLimit: '1'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ components:
- name: runtime
container:
image: registry.access.redhat.com/ubi8/nodejs-12:1-36
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
endpoints:
- name: "3000-tcp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ components:
- name: runtime
container:
image: registry.access.redhat.com/ubi8/nodejs-12:1-36
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
endpoints:
- name: "3000-tcp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ components:
- name: runtime
container:
image: registry.access.redhat.com/ubi8/nodejs-12:1-36
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
endpoints:
- name: "3000-tcp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ components:
- name: runtime
container:
image: registry.access.redhat.com/ubi8/nodejs-12:1-36
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
endpoints:
- name: "3000-tcp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ components:
- name: runtime
container:
image: registry.access.redhat.com/ubi8/nodejs-12:1-36
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
endpoints:
- name: "3000-tcp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ components:
targetPort: 7890
exposure: none
image: registry.access.redhat.com/ubi8/nodejs-14:latest
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
mountSources: true
name: runtime
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ components:
- name: runtime
container:
image: registry.access.redhat.com/ubi8/nodejs-12:1-36
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
endpoints:
- name: "3000-tcp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ components:
- name: runtime
container:
image: quay.io/eclipse/che-nodejs10-ubi:next
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
endpoints:
- name: "3000-tcp"
Expand All @@ -18,6 +20,8 @@ components:
- name: "tools"
container:
image: quay.io/eclipse/che-nodejs10-ubi:next
command: ["tail"]
args: ["-f", "/dev/null"]
mountSources: true
memoryLimit: 1024Mi
commands:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ components:
- name: runtime
container:
image: registry.access.redhat.com/ubi8/nodejs-12:1-36
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
sourceMapping: /apps
endpoints:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ components:
- name: runtime
container:
image: registry.access.redhat.com/ubi8/nodejs-12:1-36
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
endpoints:
- name: "3000-tcp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ components:
- name: runtime
container:
image: registry.access.redhat.com/ubi8/nodejs-12:1-36
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
endpoints:
- name: "3000-tcp"
Expand Down
2 changes: 2 additions & 0 deletions tests/examples/source/devfiles/nodejs/devfile-with-tag.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ components:
- name: runtime
container:
image: registry.access.redhat.com/ubi8/nodejs-12:1-36
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
endpoints:
- name: "3000-tcp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ components:
- name: http-3000
targetPort: 3000
image: registry.access.redhat.com/ubi8/nodejs-14:latest
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
mountSources: true
sourceMapping: /project
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ components:
- name: runtime
container:
image: quay.io/eclipse/che-nodejs10-ubi:next
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
endpoints:
- name: "3000-tcp"
Expand All @@ -18,6 +20,8 @@ components:
- name: "tools"
container:
image: quay.io/eclipse/che-nodejs10-ubi:next
command: ["tail"]
args: ["-f", "/dev/null"]
mountSources: true
memoryLimit: 1024Mi
commands:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ components:
- name: runtime
container:
image: quay.io/eclipse/che-nodejs10-ubi:next
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
env:
- name: FOO
Expand All @@ -25,6 +27,8 @@ components:
- name: runtime2
container:
image: quay.io/eclipse/che-nodejs10-ubi:next
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
mountSources: false
volumeMounts:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ components:
- name: runtime
container:
image: quay.io/eclipse/che-nodejs10-ubi:next
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
env:
- name: FOO
Expand All @@ -24,6 +26,8 @@ components:
- name: runtime2
container:
image: quay.io/eclipse/che-nodejs10-ubi:next
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
mountSources: false
volumeMounts:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ components:
- name: runtime
container:
image: registry.access.redhat.com/ubi8/nodejs-12:1-36
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
endpoints:
- name: "3000-tcp"
Expand Down
2 changes: 2 additions & 0 deletions tests/examples/source/devfiles/nodejs/devfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ components:
- name: runtime
container:
image: registry.access.redhat.com/ubi8/nodejs-12:1-36
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
endpoints:
- name: "3000-tcp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ components:
- name: runtime
container:
image: registry.access.redhat.com/ubi8/nodejs-12:1-36
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
mountSources: true
endpoints:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ components:
- name: runtime
container:
image: registry.access.redhat.com/ubi8/nodejs-12:1-36
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
mountSources: true
endpoints:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ components:
- name: runtime
container:
image: registry.access.redhat.com/ubi8/nodejs-12:1-36
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
mountSources: true
endpoints:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ components:
- name: runtime
container:
image: registry.access.redhat.com/ubi8/nodejs-12:1-36
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
mountSources: true
endpoints:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ components:
- name: runtime
container:
image: quay.io/eclipse/che-nodejs10-ubi:next
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
mountSources: true
sourceMapping: /test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ components:
- name: http-3000
targetPort: 3000
image: registry.access.redhat.com/ubi8/nodejs-14:0.1.0
command: ["tail"]
args: ["-f", "/dev/null"]
memoryLimit: 1024Mi
mountSources: true
name: runtime
Expand Down

0 comments on commit 88e0c73

Please sign in to comment.