Skip to content

Commit 089cfd5

Browse files
Bot Updating Templated Files
1 parent 73148b5 commit 089cfd5

File tree

2 files changed

+47
-43
lines changed

2 files changed

+47
-43
lines changed

.github/CONTRIBUTING.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ If you are proposing additional packages to be added, ensure that you added the
9696

9797
### Testing your changes
9898

99-
```
99+
```bash
100100
git clone https://github.com/linuxserver/docker-bookstack.git
101101
cd docker-bookstack
102102
docker build \
@@ -106,13 +106,14 @@ docker build \
106106
```
107107

108108
The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
109-
```
109+
110+
```bash
110111
docker run --rm --privileged multiarch/qemu-user-static:register --reset
111112
```
112113

113114
Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
114115

115-
## Update the chagelog
116+
## Update the changelog
116117

117118
If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-bookstack/tree/master/root), add an entry to the changelog
118119

README.md

Lines changed: 43 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!-- DO NOT EDIT THIS FILE MANUALLY -->
2-
<!-- Please read the CONTRIBUTING.md -->
2+
<!-- Please read the https://github.com/linuxserver/docker-bookstack/blob/master/.github/CONTRIBUTING.md -->
33

44
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)
55

@@ -12,13 +12,14 @@
1212

1313
The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring:
1414

15-
* regular and timely application updates
16-
* easy user mappings (PGID, PUID)
17-
* custom base image with s6 overlay
18-
* weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth
19-
* regular security updates
15+
* regular and timely application updates
16+
* easy user mappings (PGID, PUID)
17+
* custom base image with s6 overlay
18+
* weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth
19+
* regular security updates
2020

2121
Find us at:
22+
2223
* [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more!
2324
* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
2425
* [Discourse](https://discourse.linuxserver.io) - post on our community forum.
@@ -44,7 +45,6 @@ Powered by SQL and including a Markdown editor for those who prefer it, BookStac
4445

4546
For more information on BookStack visit their website and check it out: https://www.bookstackapp.com
4647

47-
4848
[![bookstack](https://s3-us-west-2.amazonaws.com/linuxserver-docs/images/bookstack-logo500x500.png)](https://github.com/BookStackApp/BookStack)
4949

5050
## Supported Architectures
@@ -61,6 +61,27 @@ The architectures supported by this image are:
6161
| arm64 | arm64v8-latest |
6262
| armhf | arm32v7-latest |
6363

64+
## Application Setup
65+
66+
67+
The default username is admin@admin.com with the password of **password**, access the container at http://dockerhost:6875.
68+
69+
This application is dependent on a MySQL database be it one you already have or a new one. If you do not already have one, set up our MariaDB container here https://hub.docker.com/r/linuxserver/mariadb/.
70+
71+
72+
If you intend to use this application behind a subfolder reverse proxy, such as our SWAG container or Traefik you will need to make sure that the `APP_URL` environment variable is set to your external domain, or it will not work
73+
74+
Documentation for BookStack can be found at https://www.bookstackapp.com/docs/
75+
76+
### Advanced Users (full control over the .env file)
77+
If you wish to use the extra functionality of BookStack such as email, Memcache, LDAP and so on you will need to make your own .env file with guidance from the BookStack documentation.
78+
79+
When you create the container, do not set any arguments for any SQL settings. The container will copy an exemplary .env file to /config/www/.env on your host system for you to edit.
80+
81+
#### PDF Rendering
82+
[wkhtmltopdf](https://wkhtmltopdf.org/) is available to use as an alternative PDF rendering generator as described at https://www.bookstackapp.com/docs/admin/pdf-rendering/.
83+
84+
The path to wkhtmltopdf in this image to include in your .env file is `/usr/bin/wkhtmltopdf`.
6485

6586
## Usage
6687

@@ -111,7 +132,7 @@ services:
111132

112133
### docker cli
113134

114-
```
135+
```bash
115136
docker run -d \
116137
--name=bookstack \
117138
-e PUID=1000 \
@@ -127,7 +148,6 @@ docker run -d \
127148
ghcr.io/linuxserver/bookstack
128149
```
129150

130-
131151
## Parameters
132152

133153
Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.
@@ -150,7 +170,7 @@ You can set any environment variable from a file by using a special prepend `FIL
150170

151171
As an example:
152172

153-
```
173+
```bash
154174
-e FILE__PASSWORD=/run/secrets/mysecretpassword
155175
```
156176

@@ -169,42 +189,17 @@ Ensure any volume directories on the host are owned by the same user you specify
169189

170190
In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below:
171191

172-
```
192+
```bash
173193
$ id username
174194
uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
175195
```
176196

177-
178-
&nbsp;
179-
## Application Setup
180-
181-
182-
The default username is admin@admin.com with the password of **password**, access the container at http://dockerhost:6875.
183-
184-
This application is dependent on a MySQL database be it one you already have or a new one. If you do not already have one, set up our MariaDB container here https://hub.docker.com/r/linuxserver/mariadb/.
185-
186-
187-
If you intend to use this application behind a subfolder reverse proxy, such as our SWAG container or Traefik you will need to make sure that the `APP_URL` environment variable is set to your external domain, or it will not work
188-
189-
Documentation for BookStack can be found at https://www.bookstackapp.com/docs/
190-
191-
### Advanced Users (full control over the .env file)
192-
If you wish to use the extra functionality of BookStack such as email, Memcache, LDAP and so on you will need to make your own .env file with guidance from the BookStack documentation.
193-
194-
When you create the container, do not set any arguments for any SQL settings. The container will copy an exemplary .env file to /config/www/.env on your host system for you to edit.
195-
196-
#### PDF Rendering
197-
[wkhtmltopdf](https://wkhtmltopdf.org/) is available to use as an alternative PDF rendering generator as described at https://www.bookstackapp.com/docs/admin/pdf-rendering/.
198-
199-
The path to wkhtmltopdf in this image to include in your .env file is `/usr/bin/wkhtmltopdf`.
200-
201-
202197
## Docker Mods
198+
203199
[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=bookstack&query=%24.mods%5B%27bookstack%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=bookstack "view available mods for this container.") [![Docker Universal Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=universal&query=%24.mods%5B%27universal%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=universal "view available universal mods.")
204200

205201
We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) as well as universal mods that can be applied to any one of our images can be accessed via the dynamic badges above.
206202

207-
208203
## Support Info
209204

210205
* Shell access whilst the container is running: `docker exec -it bookstack /bin/bash`
@@ -221,38 +216,45 @@ Most of our images are static, versioned, and require an image update and contai
221216
Below are the instructions for updating containers:
222217

223218
### Via Docker Compose
219+
224220
* Update all images: `docker-compose pull`
225221
* or update a single image: `docker-compose pull bookstack`
226222
* Let compose update all containers as necessary: `docker-compose up -d`
227223
* or update a single container: `docker-compose up -d bookstack`
228224
* You can also remove the old dangling images: `docker image prune`
229225

230226
### Via Docker Run
227+
231228
* Update the image: `docker pull ghcr.io/linuxserver/bookstack`
232229
* Stop the running container: `docker stop bookstack`
233230
* Delete the container: `docker rm bookstack`
234231
* Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
235232
* You can also remove the old dangling images: `docker image prune`
236233

237234
### Via Watchtower auto-updater (only use if you don't remember the original parameters)
235+
238236
* Pull the latest image at its tag and replace it with the same env variables in one run:
239-
```
237+
238+
```bash
240239
docker run --rm \
241240
-v /var/run/docker.sock:/var/run/docker.sock \
242241
containrrr/watchtower \
243242
--run-once bookstack
244243
```
244+
245245
* You can also remove the old dangling images: `docker image prune`
246246

247247
**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose).
248248

249249
### Image Update Notifications - Diun (Docker Image Update Notifier)
250+
250251
* We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
251252

252253
## Building locally
253254

254255
If you want to make local modifications to these images for development purposes or just to customize the logic:
255-
```
256+
257+
```bash
256258
git clone https://github.com/linuxserver/docker-bookstack.git
257259
cd docker-bookstack
258260
docker build \
@@ -262,7 +264,8 @@ docker build \
262264
```
263265

264266
The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
265-
```
267+
268+
```bash
266269
docker run --rm --privileged multiarch/qemu-user-static:register --reset
267270
```
268271

0 commit comments

Comments
 (0)