You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by he...@apache.org on 2015/06/29 22:23:10 UTC
[06/20] allura git commit: [#7809] ticket:803 Update install
instructions to use Ubuntu 14.04
[#7809] ticket:803 Update install instructions to use Ubuntu 14.04
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/2e3ac2c9
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/2e3ac2c9
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/2e3ac2c9
Branch: refs/heads/hs/7894
Commit: 2e3ac2c9d7026037fafa34ac8a7ef9dd340a12d4
Parents: 976b98b
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue Jun 16 18:06:37 2015 +0300
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Jun 17 10:36:26 2015 -0400
----------------------------------------------------------------------
Dockerfile | 2 +-
INSTALL.markdown | 6 +++---
solr_config/Dockerfile | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/2e3ac2c9/Dockerfile
----------------------------------------------------------------------
diff --git a/Dockerfile b/Dockerfile
index 916ed33..12170ef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-FROM ubuntu:12.04
+FROM ubuntu:14.04
RUN apt-get update && apt-get install -y \
git-core \
http://git-wip-us.apache.org/repos/asf/allura/blob/2e3ac2c9/INSTALL.markdown
----------------------------------------------------------------------
diff --git a/INSTALL.markdown b/INSTALL.markdown
index d9a64ee..d141988 100644
--- a/INSTALL.markdown
+++ b/INSTALL.markdown
@@ -21,11 +21,11 @@
For a simpler setup using Docker images, see INSTALL-Docker.markdown instead.
-In these instructions, we'll use [VirtualBox](http://www.virtualbox.org) and [Ubuntu 12.04](http://ubuntu.com) (11.10 works too) to create a disposable sandbox for Allura development/testing. Allura should work on other Linux systems (including OSX), but setting up all the dependencies will be different.
+In these instructions, we'll use [VirtualBox](http://www.virtualbox.org) and [Ubuntu 14.04](http://ubuntu.com) (12.04 works too) to create a disposable sandbox for Allura development/testing. Allura should work on other Linux systems (including OSX), but setting up all the dependencies will be different.
* Download and install [VirtualBox](http://www.virtualbox.org/wiki/Downloads) for your platform.
-* Download a minimal [Ubuntu 12.04 64-bit ISO](https://help.ubuntu.com/community/Installation/MinimalCD).
+* Download a minimal [Ubuntu 14.04 64-bit ISO](https://help.ubuntu.com/community/Installation/MinimalCD).
* Create a new virtual machine in Virtual Box, selecting Ubuntu (64 bit) as the OS type. The rest of the wizards' defaults are fine.
@@ -42,7 +42,7 @@ Before we begin, you'll need to install some system packages.
~$ sudo aptitude install git-core default-jre-headless python-dev libssl-dev libldap2-dev libsasl2-dev libjpeg8-dev zlib1g-dev
-To install MongoDB, follow the instructions here: <http://docs.mongodb.org/manual/tutorial/install-mongodb-on-ubuntu/>
+To install MongoDB, follow the instructions here: <http://docs.mongodb.org/v2.6/tutorial/install-mongodb-on-ubuntu/>
Optional, for SVN support:
http://git-wip-us.apache.org/repos/asf/allura/blob/2e3ac2c9/solr_config/Dockerfile
----------------------------------------------------------------------
diff --git a/solr_config/Dockerfile b/solr_config/Dockerfile
index 107768f..714840c 100644
--- a/solr_config/Dockerfile
+++ b/solr_config/Dockerfile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-FROM ubuntu:12.04
+FROM ubuntu:14.04
RUN apt-get update && apt-get install -y \
default-jre-headless \