Skip to content

Commit

Permalink
upgraded to v3.9.0 and updated node versions
Browse files Browse the repository at this point in the history
  • Loading branch information
ruromero committed May 13, 2018
1 parent a06cb0c commit 0706db8
Show file tree
Hide file tree
Showing 5 changed files with 187 additions and 116 deletions.
11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ This laboratory is intended to be deployed using [minishift](https://github.com/
1. Install the latest version of [minishift](https://github.com/minishift/minishift)

```
./minishift start --profile bfdevconf --openshift-version v3.7.1
./minishift start --profile bfdevconf --openshift-version v3.9.0
-- Starting profile 'bfdevconf'
-- Checking if requested hypervisor 'kvm' is supported on this platform ... OK
-- Checking if KVM driver is installed ...
Expand All @@ -42,11 +42,11 @@ This laboratory is intended to be deployed using [minishift](https://github.com/
oc login -u system:admin
```

2. Download the add-on and install it. Check the [v3.7.1 release](https://github.com/ruromero/devconf/releases/tag/v3.7.1):
2. Download the add-on and install it. Check the [v3.9.0 release](https://github.com/ruromero/devconf/releases/tag/v3.9.0):

```
$ wget https://github.com/ruromero/devconf/releases/download/v3.7.1/bf-addons-3.7.1.tar.gz
$ tar -xf bf-addons-3.7.1.tar.gz
$ wget https://github.com/ruromero/devconf/releases/download/v3.9.0/bf-addons-3.9,0.tar.gz
$ tar -xf bf-addons-3.9.0.tar.gz
$ ./minishift addons install bf-addons
Addon 'bf-devconf' installed
$ ./minishift addons apply bf-devconf
Expand Down Expand Up @@ -97,10 +97,9 @@ The Docker images are also published in Docker Hub

### Web TTY
We also included a Web-based OpenShift Command Line utility based on [online-oc](https://github.com/edseymour/online-oc).
+ You can access the route directly:
+ You can access the route directly:
```
$ oc get routes -n tty --as system:admin
NAME HOST/PORT PATH SERVICES PORT TERMINATION WILDCARD
online-oc online-oc-tty.192.168.42.95.nip.io online-oc 8080-tcp None
```

2 changes: 1 addition & 1 deletion README.offline.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ tar -xvf $HOME/minishift_home.tar.gz -C $HOME
./minishift addons apply bf-devconf
```

4. Ensure that you are using the openshift client matching the minishift version, in this case v3.7.1, you have copies on the pendrives.
4. Ensure that you are using the openshift client matching the minishift version, in this case v3.9.0, you have copies on the pendrives.

5. Wait until all the applications are running

Expand Down
2 changes: 1 addition & 1 deletion bf-addons/manager-app-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ objects:
- name: SCOREBOARD_PORT
value: ${SCOREBOARD_PORT}
name: ${APP_NAME}
image: ruromero/manager-app:3.7.1
image: ruromero/manager-app:3.9.0
imagePullPolicy: IfNotPresent
serviceAccountName: ${APP_NAME}
triggers:
Expand Down
4 changes: 2 additions & 2 deletions images/manager-app/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ FROM centos/nodejs-6-centos7

MAINTAINER Ruben Romero Montes <rromerom@redhat.com>

ENV OC_TOOL=openshift-origin-client-tools-v3.7.1-ab0f056-linux-64bit \
ENV OC_TOOL=openshift-origin-client-tools-v3.9.0-191fece-linux-64bit.tar.gz \
PATH=$PATH:$APP_ROOT/etc/oc-tool \
INSTALL_DIR=/opt/rh/rh-nodejs6/root/usr/bin

ADD https://github.com/openshift/origin/releases/download/v3.7.1/$OC_TOOL.tar.gz $APP_ROOT/etc
ADD https://github.com/openshift/origin/releases/download/v3.9.0/$OC_TOOL.tar.gz $APP_ROOT/etc

USER root

Expand Down
Loading

0 comments on commit 0706db8

Please sign in to comment.