Merge pull request #28 from hpcloud/t4-518-deprecate-all-the-things

T4-518 - remove deprecated elements of the console

Author: woodm1979

README.md

@@ -43,15 +43,15 @@ docker-compose -f docker-compose.development.yml build
 
 ### Run
 ```
-docker-compose up
+docker-compose -f docker-compose.development.yml up
 ```
 
 ### Or run in background
 ```
-docker-compose up -d
+docker-compose -f docker-compose.development.yml up -d
 ```
 
-Wait until the UI container finishing building (the `stratosdeploy_ui_1` container stop running), the Web UI should now be running on your docker host ID, usually 192.168.99.100.
+Wait until the UI container finishing building (the `stratosdeploy_ui_1` container stop running), the Web UI should now be running on your docker host ID, discoverable via `docker-machine ip [machine-name]`
 
 ### Stop
 

build_and_tag.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -eu
 
 # set the defaults for docker registry and tag
 DOCKER_REGISTRY=docker-registry.helion.space:443
@@ -71,12 +71,6 @@ rm -rf ${__DIRNAME}/output/*
 rm -rf ${__DIRNAME}/../stratos-ui/dist
 rm -rf ${__DIRNAME}/../stratos-server/dist
 
-# Build and publish all of the images for Stratos Console UI
-buildAndPublishImage cnap-console-db Dockerfile.UCP  ${__DIRNAME}/../stratos-identity-db
-buildAndPublishImage cnap-console-mock-api Dockerfile.mock_api.UCP ${__DIRNAME}/../stratos-node-server
-buildAndPublishImage cnap-console-mock-auth Dockerfile.mock_auth.UCP ${__DIRNAME}/../stratos-node-server
-buildAndPublishImage cnap-console-api Dockerfile.UCP ${__DIRNAME}/../stratos-node-server
-
 # Build Portal Proxy
 PORTAL_PROXY_PATH=$GOPATH/src/github.com/hpcloud/portal-proxy
 pushd ${PORTAL_PROXY_PATH}

cleanup-docker-compose.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+set -eu
+
 echo "Cleaning up docker-compose"
 docker-compose stop && docker-compose rm -f
 docker stop stratosdeploy_proxy_1 && docker rm stratosdeploy_proxy_1

common.yml

@@ -1,20 +1,3 @@
-data:
-  image: ubuntu:14.04
-  volumes:
-    - /var/lib/mysql
-
-
-db:
-  image: mysql:5.7
-  env_file:
-    ./db.env
-  volumes:
-    - ../stratos-identity-db/versions:/docker-entrypoint-initdb.d
-  # NOTE: volumes_from field must be included individually if extending this file.
-  #volumes_from:
-  #  - data
-
-
 postgres:
   image: postgres:latest
   env_file:
@@ -25,51 +8,6 @@ postgres:
     - $GOPATH/src/github.com/hpcloud/portal-proxy/db/initial:/docker-entrypoint-initdb.d
 
 
-# Mock Cloud Foundry service
-cf:
-  build: ../stratos-node-server
-  dockerfile: Dockerfile.demo.mock_api
-  ports:
-    - "3002:3002"
-  environment:
-    - PORT=3002
-  volumes:
-    - ../stratos-node-server:/usr/src/app
-    - /usr/src/app/node_modules
-
-
-# Mock Auth service
-auth:
-  build: ../stratos-node-server
-  dockerfile: Dockerfile.demo.mock_auth
-  ports:
-    - "3001:3001"
-  environment:
-    - PORT=3001
-  volumes:
-    - ../stratos-node-server:/usr/src/app
-    - /usr/src/app/node_modules
-
-
-api:
-  build: ../stratos-node-server
-  dockerfile: Dockerfile.prod
-  ports:
-    - "3000:3000"
-  env_file:
-    ./db.env
-  environment:
-    - PORT=3000
-  volumes:
-    - ../stratos-node-server:/usr/src/app
-    - /usr/src/app/node_modules
-  # NOTE: links field must be included individually if extending this file.
-  #links:
-  #  - db:db
-  #  - auth:auth_service
-  #  - cf:cf_service
-
-
 proxy:
   build: $GOPATH/src/github.com/hpcloud/portal-proxy
   dockerfile: Dockerfile.server

db.env

@@ -1,46 +1,4 @@
 # The development docker-compose file.
-# Use this to have things like "gulp watch" running in the UI.
-data:
-  extends:
-    file: common.yml
-    service: data
-
-
-db:
-  extends:
-    file: common.yml
-    service: db
-  volumes_from:
-    - data
-
-
-# Mock Cloud Foundry service
-cf:
-  extends:
-    file: common.yml
-    service: cf
-
-
-# Mock Auth service
-auth:
-  extends:
-    file: common.yml
-    service: auth
-
-
-api:
-  extends:
-    file: common.yml
-    service: api
-  environment:
-    GITHUB_OAUTH_CLIENT_ID: ${GITHUB_OAUTH_CLIENT_ID}
-    GITHUB_OAUTH_CLIENT_SECRET: ${GITHUB_OAUTH_CLIENT_SECRET}
-    GITHUB_OAUTH_REDIRECT_URL: ${GITHUB_OAUTH_REDIRECT_URL}
-  links:
-    - db:db
-    - auth:auth_service
-    - cf:cf_service
-
 
 postgres:
   extends:
@@ -61,7 +19,6 @@ nginx:
     file: common.yml
     service: nginx
   links:
-    - api:api
     - proxy:proxy
 
 

docker-compose.development.yml

@@ -1,9 +1,9 @@
 #!/bin/bash
+set -eu
+
 cd ../..
 git clone https://github.com/hpcloud/helion-ui-theme.git
 git clone https://github.com/hpcloud/helion-ui-framework.git
-git clone https://github.com/hpcloud/stratos-identity-db.git
-git clone https://github.com/hpcloud/stratos-node-server.git
 git clone https://github.com/hpcloud/stratos-server.git
 git clone https://github.com/hpcloud/stratos-ui.git
 

docker-compose.testing.yml

@@ -1,4 +1,6 @@
 #!/bin/bash
+set -eu
+
 cd $GOPATH/src/github.com/hpcloud/portal-proxy/tools/
 ./build_portal_proxy.sh
 cd -

docker-compose.yml

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -eu
 
 echo "===== Cleaning up cached intermediate items"
 

docs/start_fresh.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -eu
 
 # USAGE:  docker-machine-create <machine-name>
 #   machine-name defaults to "default"