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

[FIX] Updated OpenShift Template to take an Image as a Param #9946

Merged
merged 12 commits into from
Apr 10, 2018
Merged

[FIX] Updated OpenShift Template to take an Image as a Param #9946

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5ed4b9f
Updated template to use ROCKETCHAT_IMAGE
christianh814 Feb 28, 2018
ac6d37a
Updated template to use ROCKETCHAT_IMAGE
christianh814 Feb 28, 2018
b3e6edc
Merge branch 'develop' into develop
christianh814 Mar 2, 2018
4c28124
Merge branch 'develop' into develop
christianh814 Mar 6, 2018
00051ff
Merge branch 'develop' into develop
christianh814 Mar 7, 2018
10a784d
Merge branch 'develop' into develop
christianh814 Mar 8, 2018
70cafae
Merge branch 'develop' into develop
christianh814 Mar 11, 2018
651ac98
Merge branch 'develop' into develop
christianh814 Mar 16, 2018
b90ea15
Merge branch 'develop' into develop
christianh814 Apr 5, 2018
5de1e8e
Merge branch 'develop' into develop
geekgonecrazy Apr 9, 2018
1c83529
Merge branch 'develop' into develop
geekgonecrazy Apr 9, 2018
c686bd4
Merge branch 'develop' into develop
geekgonecrazy Apr 10, 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
11 changes: 9 additions & 2 deletions .openshift/rocket-chat-ephemeral.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
"name": "rocketchat"
},
"spec": {
"dockerImageRepository": "registry.connect.redhat.com/rocketchat/rocketchat",
"dockerImageRepository": "${ROCKETCHAT_IMAGE}",
"tags": [
{
"name": "latest",
Expand Down Expand Up @@ -241,7 +241,7 @@
"containers": [
{
"name": "rocketchat",
"image": "registry.connect.redhat.com/rocketchat/rocketchat:latest",
"image": "${ROCKETCHAT_IMAGE}:latest",
"ports": [
{
"containerPort": 3000,
Expand Down Expand Up @@ -424,6 +424,13 @@
"value": "rocketchatdb",
"required": true
},
{
"name": "ROCKETCHAT_IMAGE",
"displayName": "RocketChat Image",
"description": "The RocketChat image to use for this deployment",
"required": true,
"value": "rocketchat/rocket.chat"
},
{
"name": "MONGODB_ADMIN_PASSWORD",
"displayName": "MongoDB Admin Password",
Expand Down
11 changes: 9 additions & 2 deletions .openshift/rocket-chat-persistent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
"name": "rocketchat"
},
"spec": {
"dockerImageRepository": "registry.connect.redhat.com/rocketchat/rocketchat",
"dockerImageRepository": "${ROCKETCHAT_IMAGE}",
"tags": [
{
"name": "latest",
Expand Down Expand Up @@ -261,7 +261,7 @@
"containers": [
{
"name": "rocketchat",
"image": "registry.connect.redhat.com/rocketchat/rocketchat:latest",
"image": "${ROCKETCHAT_IMAGE}:latest",
"ports": [
{
"containerPort": 3000,
Expand Down Expand Up @@ -452,6 +452,13 @@
"from": "[a-zA-Z0-9]{16}",
"required": true
},
{
"name": "ROCKETCHAT_IMAGE",
"displayName": "RocketChat Image",
"description": "The RocketChat image to use for this deployment",
"required": true,
"value": "rocketchat/rocket.chat"
},
{
"name": "VOLUME_CAPACITY",
"displayName": "Volume Capacity",
Expand Down