Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

init and cli images should not use tag from CHE #8474

Merged
merged 2 commits into from
Jan 26, 2018
Merged

init and cli images should not use tag from CHE #8474

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6bd53a
init and cli images should not use tag from CHE
Jan 26, 2018
76a7478
Update ocp.sh
Jan 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions dockerfiles/init/modules/openshift/files/scripts/ocp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ export IMAGE_PULL_POLICY=${IMAGE_PULL_POLICY:-${DEFAULT_IMAGE_PULL_POLICY}}
DEFAULT_CHE_IMAGE_REPO="eclipse/che-server"
export CHE_IMAGE_REPO=${CHE_IMAGE_REPO:-${DEFAULT_CHE_IMAGE_REPO}}

DEFAULT_IMAGE_INIT="eclipse/che-init:${CHE_IMAGE_TAG}"
DEFAULT_IMAGE_INIT="eclipse/che-init:nightly"
export IMAGE_INIT=${IMAGE_INIT:-${DEFAULT_IMAGE_INIT}}

DEFAULT_CHE_CLI_IMAGE="eclipse/che-cli:${CHE_IMAGE_TAG}"
DEFAULT_CHE_CLI_IMAGE="eclipse/che-cli:nightly"
export CHE_CLI_IMAGE=${CHE_CLI_IMAGE:-${DEFAULT_CHE_CLI_IMAGE}}

DEFAULT_CONFIG_DIR="/tmp/che-config"
Expand Down Expand Up @@ -278,7 +278,9 @@ parse_args() {
--remove-che - remove existing che project
===================================
ENV vars
CHE_IMAGE_TAG - set CHE images tag, default: nightly
CHE_IMAGE_TAG - set che-server image tag, default: nightly
CHE_CLI_IMAGE - set che-cli image, default: eclipse/che-cli:nightly
IMAGE_INIT - set che-cli image, default: eclipse/che-init:nightly
CHE_MULTIUSER - set CHE multi user mode, default: false (single user)
OC_PUBLIC_HOSTNAME - set ocp hostname to admin console, default: host ip
OC_PUBLIC_IP - set ocp hostname for routing suffix, default: host ip
Expand Down