Skip to content

Commit

Permalink
further progress smartem platform
Browse files Browse the repository at this point in the history
  • Loading branch information
justb4 committed Apr 25, 2016
1 parent 3c01b7b commit 3e2faf1
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 4 deletions.
6 changes: 3 additions & 3 deletions docker/apache2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ Docker image runs both Apache2 and SSH daemons.

## Building

docker build -t geonovum/apache2 .
sudo docker build -t geonovum/apache2 .

## Running

docker run -p 2222:22 -p 80:80 -t -i geonovum/apache2
sudo docker run -p 2222:22 -p 80:80 -t -i geonovum/apache2

This runs the image and exposes ports 2222 and 8081 mappoing these to the standard
ports 22 and 80 within the container.

Mapping volumes can be handly to maintain all config and data outside the container.
Note that full paths are required.

docker run -p 2222:22 -p 80:80 -v `pwd`/log:/var/log/apache2 -t -i geonovum/apache2
sudo docker run -d -p 2222:22 -p 80:80 -v `pwd`/log:/var/log/apache2 -t -i geonovum/apache2

58 changes: 58 additions & 0 deletions docker/bootstrap.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
#!/bin/bash
#
# This prepares an empty Ubuntu system for running the SmartEmission Data Platform
# run this script onze as the admin user with full sudo rights: usually "ubuntu" or "vagrant"
# NB DO NOT RUN THIS AS root !!
#
# NB2 On Fiware lab VM: add "127.0.0.1 localhost hostname" to /etc/hosts

sudo apt-get update
sudo apt-get -y upgrade
sudo apt-get install -y apt-transport-https ca-certificates # usually already installed

# Add key
sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D

# Add to repo by putting this line in /etc/apt/sources.list.d/docker.list
sudo echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" > ~/docker.list
sudo echo "" >> ~/docker.list

sudo mv ~/docker.list /etc/apt/sources.list.d/docker.list

sudo apt-get update

# check we get from right repo
# apt-cache policy docker-engine

# The linux-image-extra package allows you use the aufs storage driver.
# at popup keep locally installed config option
sudo apt-get install -y linux-image-extra-$(uname -r)

# If you are installing on Ubuntu 14.04 or 12.04, apparmor is required.
# You can install it using (usually already installed)
# sudo apt-get install -y apparmor

# install docker engine
sudo apt-get install -y docker-engine

# Start the docker daemon. Usually already running
sudo service docker start

# test
# sudo docker run hello-world

# Emacs
sudo apt-get install -y emacs24-nox
sudo apt-get install -y postgresql-client-9.3

# The rest
# Github
sudo mkdir -p /opt/geonovum/smartem

sudo chown -R ${USER}:${USER} /opt/geonovum

cd /opt/geonovum/smartem

git clone https://github.com/Geonovum/smartemission.git git

echo "READY: now build and deploy components using Docker and Debian Packages"
6 changes: 6 additions & 0 deletions docs/platform/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ See the popup image above, do the following selections in the various tabs:
* `Access&Security` tab: select keypair just created and enable all `security groups`
* `Networking` tab: assign both ``floating-IP`` and ``shared-net`` to `selected networks`
* other tabs: leave as is
* login via ``ssh -i <privkey_from_keypair>.pem ubuntu@<IP_address>``

Local - Vagrant
---------------
Expand Down Expand Up @@ -311,6 +312,11 @@ Now our system is ready to roll out Docker images.
Docker Images
-------------

Apache2
~~~~~~~

PostGIS from Kartoza, see https://hub.docker.com/r/kartoza/postgis/ and https://github.com/kartoza/docker-postgis ::

PostGIS
~~~~~~~

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion specs/rawsensor-api/rawsensor-api.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Sensor REST API version 1.1
===============================================================================
Authors: Just van den Broecke en Robert Kieboom
Date: 2015/1/18
Date: 2016/1/18
===============================================================================


Expand Down

0 comments on commit 3e2faf1

Please sign in to comment.