Skip to content

Commit

Permalink
RELEASE: Set tags in Dockerfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
Roman Iuvshyn committed Jan 18, 2019
1 parent 0920430 commit 151fafc
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions deploy/openshift/deploy_che.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ HELP="
===================================
ENV vars: this script automatically detect envs vars beginning with "CHE_" and passes them to Che deployments:
CHE_IMAGE_REPO - Che server Docker image, defaults to "eclipse-che-server"
CHE_IMAGE_TAG - Set che-server image tag, defaults to "nightly"
CHE_IMAGE_TAG - Set che-server image tag, defaults to "6.17.0"
CHE_INFRA_OPENSHIFT_PROJECT - namespace for workspace objects (defaults to current namespace of Che pod (CHE_OPENSHIFT_PROJECT which defaults to eclipse-che)). It can be overriden with -p|--project param. A separate ws namespace can be used only if username/password or token is provided
CHE_INFRA_KUBERNETES_PVC_STRATEGY - One PVC per workspace (unique) or one PVC shared by all workspaced (common). Defaults to unique
CHE_INFRA_KUBERNETES_PVC_QUANTITY - PVC default claim. Set to 1Gi.
Expand Down Expand Up @@ -148,13 +148,13 @@ export CHE_OPENSHIFT_PROJECT=${CHE_OPENSHIFT_PROJECT:-${DEFAULT_CHE_OPENSHIFT_PR
DEFAULT_CHE_IMAGE_REPO="eclipse/che-server"
export CHE_IMAGE_REPO=${CHE_IMAGE_REPO:-${DEFAULT_CHE_IMAGE_REPO}}

DEFAULT_CHE_IMAGE_TAG="nightly"
DEFAULT_CHE_IMAGE_TAG="6.17.0"
export CHE_IMAGE_TAG=${CHE_IMAGE_TAG:-${DEFAULT_CHE_IMAGE_TAG}}

DEFAULT_IMAGE_KEYCLOAK="eclipse/che-keycloak"
export IMAGE_KEYCLOAK=${IMAGE_KEYCLOAK:-${DEFAULT_IMAGE_KEYCLOAK}}

DEFAULT_KEYCLOAK_IMAGE_TAG="nightly"
DEFAULT_KEYCLOAK_IMAGE_TAG="6.17.0"
export KEYCLOAK_IMAGE_TAG=${KEYCLOAK_IMAGE_TAG:-${DEFAULT_KEYCLOAK_IMAGE_TAG}}

DEFAULT_KEYCLOAK_IMAGE_PULL_POLICY="Always"
Expand Down
2 changes: 1 addition & 1 deletion deploy/openshift/ocp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ remove_che_from_ocp() {
}

detectIP() {
docker run --rm --net host eclipse/che-ip:nightly
docker run --rm --net host eclipse/che-ip:6.17.0
}

parse_args() {
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/cli/version/latest.ver
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.16.0
6.17.0
4 changes: 2 additions & 2 deletions dockerfiles/lib/dto-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
<parent>
<artifactId>maven-depmgt-pom</artifactId>
<groupId>org.eclipse.che.depmgt</groupId>
<version>6.17.0-SNAPSHOT</version>
<version>6.17.0</version>
</parent>
<artifactId>dto-typescript</artifactId>
<packaging>pom</packaging>
<name>Che TypeScript DTO</name>
<properties>
<che.version>6.17.0-SNAPSHOT</che.version>
<che.version>6.17.0</che.version>
</properties>
<repositories>
<repository>
Expand Down
8 changes: 4 additions & 4 deletions ide/che-core-ide-stacks/src/main/resources/stacks.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"recipe": {
"contentType": "application/x-yaml",
"type": "compose",
"content": "services:\n machine-exec:\n image: 'wsskeleton/che-machine-exec:latest'\n mem_limit: 536870912\n theia:\n image: 'eclipse/che-theia:plugin-id-nightly'\n mem_limit: 1073741824\n depends_on:\n - machine-exec\n"
"content": "services:\n machine-exec:\n image: 'wsskeleton/che-machine-exec:latest'\n mem_limit: 536870912\n theia:\n image: 'eclipse/che-theia:0.3.18-6.17.0'\n mem_limit: 1073741824\n depends_on:\n - machine-exec\n"
}
}
},
Expand Down Expand Up @@ -148,7 +148,7 @@
},
"recipe": {
"type": "openshift",
"content": "---\nkind: List\nitems:\n - \n apiVersion: v1\n kind: Pod\n metadata:\n name: ws\n spec:\n containers:\n - \n image: 'eclipse/che-theia:plugin-id-nightly'\n name: theia\n mem_limit: 1073741824\n resources:\n limits:\n memory: 1024Mi\n - \n image: 'eclipse/che-dev:nightly'\n name: dev\n mem_limit: 1073741824\n resources:\n limits:\n memory: 1536Mi\n - \n image: 'wsskeleton/che-machine-exec:latest'\n name: machine-exec\n mem_limit: 536870912\n resources:\n limits:\n memory: 512Mi\n",
"content": "---\nkind: List\nitems:\n - \n apiVersion: v1\n kind: Pod\n metadata:\n name: ws\n spec:\n containers:\n - \n image: 'eclipse/che-theia:0.3.18-6.17.0'\n name: theia\n mem_limit: 1073741824\n resources:\n limits:\n memory: 1024Mi\n - \n image: 'eclipse/che-dev:6.17.0'\n name: dev\n mem_limit: 1073741824\n resources:\n limits:\n memory: 1536Mi\n - \n image: 'wsskeleton/che-machine-exec:latest'\n name: machine-exec\n mem_limit: 536870912\n resources:\n limits:\n memory: 512Mi\n",
"contentType": "application/x-yaml"
}
}
Expand Down Expand Up @@ -236,7 +236,7 @@
},
"recipe": {
"type": "kubernetes",
"content": "---\nkind: List\nitems:\n - \n apiVersion: v1\n kind: Pod\n metadata:\n name: ws\n spec:\n containers:\n - \n image: 'eclipse/che-theia:plugin-id-nightly'\n name: theia\n resources:\n limits:\n memory: 1024Mi\n - \n image: 'eclipse/che-dev:nightly'\n name: dev\n resources:\n limits:\n memory: 1536Mi\n - \n image: 'wsskeleton/che-machine-exec:latest'\n name: machine-exec\n resources:\n limits:\n memory: 512Mi\n",
"content": "---\nkind: List\nitems:\n - \n apiVersion: v1\n kind: Pod\n metadata:\n name: ws\n spec:\n containers:\n - \n image: 'eclipse/che-theia:0.3.18-6.17.0'\n name: theia\n resources:\n limits:\n memory: 1024Mi\n - \n image: 'eclipse/che-dev:6.17.0'\n name: dev\n resources:\n limits:\n memory: 1536Mi\n - \n image: 'wsskeleton/che-machine-exec:latest'\n name: machine-exec\n resources:\n limits:\n memory: 512Mi\n",
"contentType": "application/x-yaml"
}
}
Expand Down Expand Up @@ -452,7 +452,7 @@
},
"recipe": {
"type": "kubernetes",
"content": "kind: List\nitems:\n - \n apiVersion: v1\n kind: Pod\n metadata:\n name: ws\n spec:\n containers:\n - \n image: 'eclipse/che-dev:nightly'\n name: dev\n resources:\n limits:\n memory: 512Mi\n",
"content": "kind: List\nitems:\n - \n apiVersion: v1\n kind: Pod\n metadata:\n name: ws\n spec:\n containers:\n - \n image: 'eclipse/che-dev:6.17.0'\n name: dev\n resources:\n limits:\n memory: 512Mi\n",
"contentType": "application/x-yaml"
}
}
Expand Down

0 comments on commit 151fafc

Please sign in to comment.