Skip to content

Commit

Permalink
Move to quay.io: change image id (#459)
Browse files Browse the repository at this point in the history
* feat(docker repository): Move to quay.io, change image id

Signed-off-by: Vitalii Parfonov <vparfono@redhat.com>

* revert: yarn.lock to previous commit

Signed-off-by: Vitalii Parfonov <vparfono@redhat.com>
  • Loading branch information
vparfonov authored Jan 11, 2020
1 parent aa4f9e9 commit feeeb7d
Show file tree
Hide file tree
Showing 12 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ OPTIONS
show CLI help
-i, --cheimage=cheimage
[default: eclipse/che-server:nightly] Che server container image
[default: quay.io/eclipse/che-server:nightly] Che server container image
-m, --multiuser
Starts che in multi-user mode
Expand Down
2 changes: 1 addition & 1 deletion make-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ run() {
echo "$VERSION" > VERSION

# replace nightly versions by release version
apply_sed "s#eclipse/che-server:nightly#eclipse/che-server:${VERSION}#g" src/constants.ts
apply_sed "s#quay.io/eclipse/che-server:nightly#quay.io/eclipse/che-server:${VERSION}#g" src/constants.ts
apply_sed "s#quay.io/eclipse/che-operator:nightly#quay.io/eclipse/che-operator:${VERSION}#g" src/constants.ts

# now replace package.json dependencies
Expand Down
2 changes: 1 addition & 1 deletion src/constants.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const DEFAULT_CHE_IMAGE = 'eclipse/che-server:nightly'
const DEFAULT_CHE_IMAGE = 'quay.io/eclipse/che-server:nightly'
const DEFAULT_CHE_OPERATOR_IMAGE = 'quay.io/eclipse/che-operator:nightly'

export { DEFAULT_CHE_IMAGE, DEFAULT_CHE_OPERATOR_IMAGE }
2 changes: 1 addition & 1 deletion test/api/replies/get-deployment-che-available.json
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@
}
}
],
"image": "eclipse/che-server:nightly",
"image": "quay.io/eclipse/che-server:nightly",
"imagePullPolicy": "Always",
"livenessProbe": {
"failureThreshold": 3,
Expand Down
2 changes: 1 addition & 1 deletion test/api/replies/get-deployment-che-progressing.json
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@
}
}
],
"image": "eclipse/che-server:nightly",
"image": "quay.io/eclipse/che-server:nightly",
"imagePullPolicy": "Always",
"livenessProbe": {
"failureThreshold": 3,
Expand Down
2 changes: 1 addition & 1 deletion test/api/replies/get-deployment-che-running.json
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@
}
}
],
"image": "eclipse/che-server:nightly",
"image": "quay.io/eclipse/che-server:nightly",
"imagePullPolicy": "Always",
"livenessProbe": {
"failureThreshold": 3,
Expand Down
4 changes: 2 additions & 2 deletions test/api/replies/get-pod-by-selector-pending.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
}
}
],
"image": "eclipse/che-server:latest",
"image": "quay.io/eclipse/che-server:latest",
"imagePullPolicy": "IfNotPresent",
"livenessProbe": {
"failureThreshold": 3,
Expand Down Expand Up @@ -187,7 +187,7 @@
],
"containerStatuses": [
{
"image": "eclipse/che-server:latest",
"image": "quay.io/eclipse/che-server:latest",
"imageID": "",
"lastState": {},
"name": "che",
Expand Down
6 changes: 3 additions & 3 deletions test/api/replies/get-pod-by-selector-ready.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
}
}
],
"image": "eclipse/che-server:latest",
"image": "quay.io/eclipse/che-server:latest",
"imagePullPolicy": "IfNotPresent",
"livenessProbe": {
"failureThreshold": 3,
Expand Down Expand Up @@ -184,8 +184,8 @@
"containerStatuses": [
{
"containerID": "docker://11f7e7b94950e95c5897ddcd088e22c805d8dd4a935fc8480bda6c0af38d6536",
"image": "eclipse/che-server:latest",
"imageID": "docker-pullable://eclipse/che-server@sha256:eb83b0a66eeae6dac20d196917a027e2b1430834386cbd04326009896fa574f7",
"image": "quay.io/eclipse/che-server:latest",
"imageID": "docker-pullable://quay.io/eclipse/che-server@sha256:eb83b0a66eeae6dac20d196917a027e2b1430834386cbd04326009896fa574f7",
"lastState": {},
"name": "che",
"ready": true,
Expand Down
6 changes: 3 additions & 3 deletions test/api/replies/get-pod-by-selector-running-ready.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
}
}
],
"image": "eclipse/che-server:latest",
"image": "quay.io/eclipse/che-server:latest",
"imagePullPolicy": "IfNotPresent",
"livenessProbe": {
"failureThreshold": 3,
Expand Down Expand Up @@ -184,8 +184,8 @@
"containerStatuses": [
{
"containerID": "docker://19ef7c00ad71daf78558237070e8db193a92373d103759f16cd725aa54e45c0c",
"image": "eclipse/che-server:latest",
"imageID": "docker-pullable://eclipse/che-server@sha256:eb83b0a66eeae6dac20d196917a027e2b1430834386cbd04326009896fa574f7",
"image": "quay.io/eclipse/che-server:latest",
"imageID": "docker-pullable://quay.io/eclipse/che-server@sha256:eb83b0a66eeae6dac20d196917a027e2b1430834386cbd04326009896fa574f7",
"lastState": {},
"name": "che",
"ready": true,
Expand Down
6 changes: 3 additions & 3 deletions test/api/replies/get-pod-by-selector-running.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
}
}
],
"image": "eclipse/che-server:latest",
"image": "quay.io/eclipse/che-server:latest",
"imagePullPolicy": "IfNotPresent",
"livenessProbe": {
"failureThreshold": 3,
Expand Down Expand Up @@ -188,8 +188,8 @@
"containerStatuses": [
{
"containerID": "docker://11f7e7b94950e95c5897ddcd088e22c805d8dd4a935fc8480bda6c0af38d6536",
"image": "eclipse/che-server:latest",
"imageID": "docker-pullable://eclipse/che-server@sha256:eb83b0a66eeae6dac20d196917a027e2b1430834386cbd04326009896fa574f7",
"image": "quay.io/eclipse/che-server:latest",
"imageID": "docker-pullable://quay.io/eclipse/che-server@sha256:eb83b0a66eeae6dac20d196917a027e2b1430834386cbd04326009896fa574f7",
"lastState": {},
"name": "che",
"ready": false,
Expand Down
6 changes: 3 additions & 3 deletions test/api/replies/get-pods-che-running.json
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@
}
}
],
"image": "eclipse/che-server:nightly",
"image": "quay.io/eclipse/che-server:nightly",
"imagePullPolicy": "Always",
"livenessProbe": {
"failureThreshold": 3,
Expand Down Expand Up @@ -518,8 +518,8 @@
"containerStatuses": [
{
"containerID": "docker://b9d083b708db25137a18489ee28e5ce58bde2a8bf951a28618ba83b9983c65dd",
"image": "eclipse/che-server:nightly",
"imageID": "docker-pullable://eclipse/che-server@sha256:e756e822cfdb867524b47998cd02c1f3525eaea9b9e705aab92c055b1ee3d121",
"image": "quay.io/eclipse/che-server:nightly",
"imageID": "docker-pullable://quay.io/eclipse/che-server@sha256:e756e822cfdb867524b47998cd02c1f3525eaea9b9e705aab92c055b1ee3d121",
"lastState": {
"terminated": {
"containerID": "docker://dbe9f24afd2043d4315726c106a27d072ae9450ff812eb86338b00deb3f1b8d3",
Expand Down
12 changes: 6 additions & 6 deletions test/tasks/installers/minishift-addon.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,28 @@ let minishiftAddonTasks = new MinishiftAddonTasks()
describe('Minishift addon helper', () => {
fancy
.it('extracts the tag part from an image name', async () => {
const image = 'eclipse/che:latest'
const image = 'quay.io/eclipse/che:latest'
const tag = minishiftAddonTasks.getImageTag(image)
expect(tag).to.equal('latest')
})

fancy
.it('extracts the repo part from an image name', async () => {
const image = 'eclipse/che:latest'
const image = 'quay.io/eclipse/che:latest'
const repository = minishiftAddonTasks.getImageRepository(image)
expect(repository).to.equal('eclipse/che')
expect(repository).to.equal('quay.io/eclipse/che')
})

fancy
.it('returns the repo part even if an image has no tag', async () => {
const image = 'eclipse/che'
const image = 'quay.io/eclipse/che'
const repository = minishiftAddonTasks.getImageRepository(image)
expect(repository).to.equal('eclipse/che')
expect(repository).to.equal('quay.io/eclipse/che')
})

fancy
.it('returns latest as tag if an image has no tag', async () => {
const image = 'eclipse/che'
const image = 'quay.io/eclipse/che'
const tag = minishiftAddonTasks.getImageTag(image)
expect(tag).to.equal('latest')
})
Expand Down

0 comments on commit feeeb7d

Please sign in to comment.