From 384c4831c6ec9fbd8b212636be214c122447643f Mon Sep 17 00:00:00 2001 From: Jan Renz Date: Thu, 23 Apr 2015 07:48:55 +0200 Subject: [PATCH] Starting to update the docs --- LOCAL_SETUP.md | 22 +++++++++++----------- README.md | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/LOCAL_SETUP.md b/LOCAL_SETUP.md index 2041b652..38992aab 100644 --- a/LOCAL_SETUP.md +++ b/LOCAL_SETUP.md @@ -12,14 +12,14 @@ Install qt - https://github.com/thoughtbot/capybara-webkit/wiki/Installing-Qt-an Install and setup Create a local codeOceanRoot: mkdir /path/to/CodeOcean ==> codeOceanRoot = /path/to/CodeOcean -Clone Hauke's Repository to codeOceanRoot - https://github.com/openHPI/codeocean (old: https://dev.xikolo.de/gitlab/hklement/xikolo-hands-on-programming, Valid https://dev.xikolo.de/gitlab user required) +Clone Repository to codeOceanRoot - https://github.com/openHPI/codeocean ==> repoPath = codeOceanRoot/xikolo-hands-on-programming cd repoPath/config duplicate .example config files (remove .example from filename) action_mailer.yml, database.yml, secrets.yml, sendmail.yml, smtp.yml add your local dbuser credentials to database.yml Linux users may need to add a "host" and a "port" parameter -Copy vagrant files from https://github.com/hklement/vagrant-docker to codeOceanRoot +Copy vagrant files from https://github.com/hklement/vagrant-docker to codeOceanRoot or use boot2docker ==> vagrantPath = codeOceanRoot/vagrant-docker-master cd vagrantPath open Vagrantfile in text editor of choice @@ -28,15 +28,15 @@ Execute: vagrant box add ubuntu/trusty64 Execute: vagrant up Install docker environments export DOCKER_HOST=tcp://192.168.23.75:2375 -docker pull hklement/ubuntu-coffee -docker pull hklement/ubuntu-java -docker pull hklement/ubuntu-sqlite -docker pull hklement/ubuntu-sinatra -docker pull hklement/ubuntu-ruby -docker pull hklement/ubuntu-python -docker pull hklement/ubuntu-node -docker pull hklement/ubuntu-html -docker pull hklement/ubuntu-jruby +docker pull openhpi/codeocean-runtime-coffee +docker pull openhpi/codeocean-runtime-java +docker pull openhpi/codeocean-runtime-sqlite +docker pull openhpi/codeocean-runtime-sinatra +docker pull openhpi/codeocean-runtime-ruby +docker pull openhpi/codeocean-runtime-python +docker pull openhpi/codeocean-runtime-node +docker pull openhpi/codeocean-runtime-html +docker pull openhpi/codeocean-runtime-jruby cd repoPath bundle install diff --git a/README.md b/README.md index a1dafb00..f10d8c2e 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ In order to execute code submissions using Docker, source code files are written - create *config/sendmail.yml* - create *config/smtp.yml* -- if Docker is not supported by your OS, set up a local Docker server, for instance using [vagrant-docker](https://github.com/hklement/vagrant-docker) +- use boot2docker if there is no native support for docker on your OS - create seed data by executing `rake db:seed` ## Production Setup