Merge branch 'release/0.16.0'

Dockerfile

@@ -1,14 +1,32 @@
 FROM ubuntu:xenial
 
-# Update apt and install wget
-RUN apt-get update && apt-get install -y wget curl apt-utils
+# Project directory
+WORKDIR /src/blockstack-browser
 
-# Add blockstack apt repo
-RUN wget -qO - https://raw.githubusercontent.com/blockstack/packaging/master/repo-key.pub | apt-key add -
-RUN echo 'deb http://packages.blockstack.com/repositories/ubuntu/ xenial main' > /etc/apt/sources.list.d/blockstack.list
+# Update apt and install wget
+RUN apt-get update && apt-get install -y wget curl apt-utils git
 
 # Install node
 RUN curl -sL https://deb.nodesource.com/setup_6.x | bash -
+RUN apt-get update && apt-get install -y nodejs
+
+# Install cors-proxy
+RUN npm install -g corsproxy
+
+# Alias the cors-proxy
+RUN ln /usr/bin/corsproxy /usr/bin/blockstack-cors-proxy
+
+# Copy files into container
+COPY . .
+
+# Install dependencies
+RUN npm install
+
+# Build production assets
+RUN /src/blockstack-browser/node_modules/.bin/gulp prod
 
-# Install blockstack-browser
-RUN apt-get update && apt-get install -y blockstack-browser
+# Setup script to run browser
+RUN echo '#!/bin/bash' >> /src/blockstack-browser/blockstack-browser
+RUN echo 'node /src/blockstack-browser/native/blockstackProxy.js 8888 /src/blockstack-browser/build' >> /src/blockstack-browser/blockstack-browser
+RUN chmod +x /src/blockstack-browser/blockstack-browser
+RUN ln /src/blockstack-browser/blockstack-browser /usr/bin/blockstack-browser

README.md

@@ -1,4 +1,4 @@
-# Blockstack Browser [![CircleCI](https://img.shields.io/circleci/project/blockstack/blockstack-browser/master.svg)](https://circleci.com/gh/blockstack/blockstack-portal/tree/master) [![License](https://img.shields.io/github/license/blockstack/blockstack-portal.svg)](https://github.com/blockstack/blockstack-portal/blob/master/LICENSE.md) [![Slack](https://img.shields.io/badge/join-slack-e32072.svg?style=flat)](http://slack.blockstack.org/)
+# Blockstack Browser [![CircleCI](https://img.shields.io/circleci/project/blockstack/blockstack-browser/master.svg)](https://circleci.com/gh/blockstack/blockstack-browser/tree/master) [![License](https://img.shields.io/github/license/blockstack/blockstack-browser.svg)](https://github.com/blockstack/blockstack-browser/blob/master/LICENSE.md) [![Slack](https://img.shields.io/badge/join-slack-e32072.svg?style=flat)](http://slack.blockstack.org/)
 
 The Blockstack Browser Portal allows you to explore the Blockstack internet.
 
@@ -15,7 +15,7 @@ The Blockstack Browser Portal allows you to explore the Blockstack internet.
 
 ## Releases
 
-[Download the latest release](https://github.com/blockstack/blockstack-portal/releases)
+[Download the latest release](https://github.com/blockstack/blockstack-browser/releases)
 
 ## Developing
 
@@ -27,10 +27,10 @@ Blockstack for macOS contains a Blockstack Core API endpoint & a CORS proxy.
 
 *Please note these instructions have only been tested on macOS 10.12.4.*
 
-1. Download and install the [latest release of Blockstack for Mac](https://github.com/blockstack/blockstack-portal/releases).
+1. Download and install the [latest release of Blockstack for Mac](https://github.com/blockstack/blockstack-browser/releases).
 1. Start Blockstack
 1. Option-click the Blockstack menu bar item and select "Enable Development Mode"
-1. Clone this repo: `git clone https://github.com/blockstack/blockstack-portal.git`
+1. Clone this repo: `git clone https://github.com/blockstack/blockstack-browser.git`
 1. Install node dependencies: `npm install`
 1. Click the Blockstack menu bar item and select "Copy Core API password"
 1. Run `npm run dev`
@@ -48,7 +48,7 @@ Blockstack for macOS contains a Blockstack Core API endpoint & a CORS proxy.
 
 #### Part 2: Install Blockstack Portal
 
-1. Clone this repo: `git clone https://github.com/blockstack/blockstack-portal.git`
+1. Clone this repo: `git clone https://github.com/blockstack/blockstack-browser.git`
 1. Install node dependencies: `npm install`
 1. Run `npm run dev-proxy` to start the CORS proxy
 1. Run `npm run dev`