summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSheogorath2019-06-13 17:30:07 +0200
committerGitHub2019-06-13 17:30:07 +0200
commit4b4c6d61684b46a5e087ee9f837be929055d174d (patch)
tree2e9066b0e23e7d16327f26b42b007caf2c733217
parent1e48b763d63d1d4bd47d6cb523a556efcdb3a3b2 (diff)
parent04d26637d6d2d1e8e7b45b9fde32af5e5b12dd80 (diff)
Merge pull request #111 from CHBMB/ls.io
Add docker image from LinuxServer.io as an install option.
-rw-r--r--README.md3
-rw-r--r--docs/setup/docker-linuxserver.md14
-rw-r--r--docs/setup/docker.md2
3 files changed, 17 insertions, 2 deletions
diff --git a/README.md b/README.md
index 467b5d2d..6720f63b 100644
--- a/README.md
+++ b/README.md
@@ -37,10 +37,11 @@ You can run CodiMD in a number of ways, and we created setup instructions for
all of these:
* [Docker](docs/setup/docker.md)
+* [Docker (LinuxServer.io)](docs/setup/docker-linuxserver.md)
* [Kubernetes](docs/setup/kubernetes.md)
* [Cloudron](docs/setup/cloudron.md)
* [Heroku](docs/setup/heroku.md)
-* [manual setup](docs/setup/manual-setup.md)
+* [Manual setup](docs/setup/manual-setup.md)
If you do not wish to run your own setup, you can find a commercial offering at
https://hackmd.io. This is not the same codebase as this one, but it is a very
diff --git a/docs/setup/docker-linuxserver.md b/docs/setup/docker-linuxserver.md
new file mode 100644
index 00000000..237630d8
--- /dev/null
+++ b/docs/setup/docker-linuxserver.md
@@ -0,0 +1,14 @@
+LinuxServer.io CodiMD Image
+===
+[![](https://img.shields.io/discord/354974912613449730.svg?logo=discord&label=LSIO%20Discord&style=flat-square)](https://discord.gg/YWrKVTn)[![](https://images.microbadger.com/badges/version/linuxserver/codimd.svg)](https://microbadger.com/images/linuxserver/codimd "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/linuxserver/codimd.svg)](https://microbadger.com/images/linuxserver/codimd "Get your own version badge on microbadger.com")![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/codimd.svg)![Docker Stars](https://img.shields.io/docker/stars/linuxserver/codimd.svg)[![Build Status](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Pipeline-Builders/docker-codimd/master)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-codimd/job/master/)[![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/codimd/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/codimd/latest/index.html)
+
+[LinuxServer.io](https://linuxserver.io) have created an Ubuntu based multiarch container for x86-64, arm64 and armhf which supports PDF export from all architectures using PhatomJS.
+
+It supports all the environmental variables detailed [here](https://github.com/codimd/server/blob/master/docs/configuration-env-vars.md) to modify it according to your needs.
+
+It gets rebuilt on new releases from CodiMD and also weekly if necessary to update any other package changes in the underlying container, making it easy to keep your CodiMD instance up to date.
+
+It also details how to easily [utilise Docker networking to reverse proxy](https://github.com/linuxserver/docker-codimd/#application-setup) CodiMD using their [LetsEncrypt docker image](https://github.com/linuxserver/docker-letsencrypt)
+
+[Github Repository](https://github.com/linuxserver/docker-codimd/)
+[Docker Hub Image](https://hub.docker.com/r/linuxserver/codimd) \ No newline at end of file
diff --git a/docs/setup/docker.md b/docs/setup/docker.md
index e72026e2..0268727c 100644
--- a/docs/setup/docker.md
+++ b/docs/setup/docker.md
@@ -1,4 +1,4 @@
-CodiMD by docker container
+CodiMD Docker Image
===
[![Try in PWD](https://cdn.rawgit.com/play-with-docker/stacks/cff22438/assets/images/button.png)](http://play-with-docker.com?stack=https://github.com/codimd/container/raw/master/docker-compose.yml&stack_name=codimd)