Skip to content

Commit

Permalink
Merge pull request #93 from FoxUSA/master
Browse files Browse the repository at this point in the history
Pull to working
  • Loading branch information
FoxUSA committed Oct 6, 2014
2 parents 0da1953 + e621465 commit 0741f2a
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 5 deletions.
14 changes: 13 additions & 1 deletion Doc/Install.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
# How to install
# How To Install
[Download most resent release from here.][Download]

# Using Docker(Full Stack)
Make sure docker in running in daemon mode with restart previously running containers on
`docker -d -r` or you could louse your notes if you do not know what your doing

Pull the current docker image
`docker pull foxusa/opennote`

and run it on port 80
`sudo docker run -d -p 80:80 -p 443:443 opennote`

or if port 80 is in use
`sudo docker run -d -p 8080:80 -p 8443:443 opennote`

# Automatic(Wizard Based Install)
To run the installer open
Expand Down
8 changes: 6 additions & 2 deletions Doc/Upgrade.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
# How to upgrade
###MySQL

##Upgrading from 14.07(Locomotive) to 14.07.01(Steam Locomotive).
All you need to do is merge your existing deployment with the release folder while keeping your config files (`openNote\openNote.config.js` and `\Service\Config.php`).

###MySQL(Recomended)
- Make sure you make a copy of you database and the OpenNote directory
- Run `Service/model/sql/updateScript/` scripts to roll the database up to current specs.
- You will copy need to copy the upload directory contents into the new upload direcory in `Service/upload`.
- You will also need to put int you database information in the new config `Service/Config.php`

###SQLite
Same as the MySQL. You may need to slightly modify the sql upload script to be compatible with sqlite.
Same as the MySQL. You may need to slightly modify the sql upload script to be compatible with SQLite. I have included as much as I can in scripts with the postfix of .sqlite.sql. SQLite does not fully support the ALTER statement.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ Please support this project by:

Thank you!

[Download most resent release from here.][Download]
[Download using Docker][Docker]

[or download manually from here.][Download]


Demo
Expand Down Expand Up @@ -102,4 +104,4 @@ Credits
[Bitcoins]: http://blockchain.info/address/15Q2jhnTvxDQm4LvTku68vTzU8j8dcLnLB
[Alternative]: http://alternativeto.net/software/opennote/
[Download]: https://github.com/FoxUSA/OpenNote/releases

[Docker]: https://registry.hub.docker.com/u/foxusa/opennote/

0 comments on commit 0741f2a

Please sign in to comment.