Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: linuxserver/docker-bookstack
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v22.03.1-ls10
Choose a base ref
...
head repository: linuxserver/docker-bookstack
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Apr 14, 2022

  1. Copy the full SHA
    a13c1a6 View commit details

Commits on Apr 28, 2022

  1. Copy the full SHA
    6249989 View commit details

Commits on May 4, 2022

  1. Copy the full SHA
    0adab4d View commit details
  2. Copy the full SHA
    4c2f3aa View commit details

Commits on May 5, 2022

  1. Copy the full SHA
    6d78458 View commit details

Commits on May 9, 2022

  1. Copy the full SHA
    09ceb8e View commit details

Commits on May 12, 2022

  1. Copy the full SHA
    3ceb46e View commit details

Commits on May 19, 2022

  1. Copy the full SHA
    0f60a18 View commit details

Commits on May 26, 2022

  1. Copy the full SHA
    1365874 View commit details

Commits on May 30, 2022

  1. Update 50-config

    improve sed for password
    drizuid authored May 30, 2022
    Copy the full SHA
    5a5da8d View commit details

Commits on May 31, 2022

  1. Merge pull request #123 from linuxserver/dbpass-sed

    Improve sed and maintain consistency with other database password sed
    aptalca authored May 31, 2022
    Copy the full SHA
    7e2f3fe View commit details
  2. Copy the full SHA
    4179bdd View commit details

Commits on Jun 2, 2022

  1. Copy the full SHA
    750e15a View commit details

Commits on Jun 9, 2022

  1. Copy the full SHA
    7c3503a View commit details

Commits on Jun 16, 2022

  1. Copy the full SHA
    0398dba View commit details

Commits on Jun 23, 2022

  1. Copy the full SHA
    3f44534 View commit details

Commits on Jun 30, 2022

  1. Copy the full SHA
    1253e76 View commit details

Commits on Jul 7, 2022

  1. Copy the full SHA
    3c5a3e7 View commit details

Commits on Jul 14, 2022

  1. Copy the full SHA
    f80eb7c View commit details

Commits on Jul 21, 2022

  1. Copy the full SHA
    8a50be6 View commit details

Commits on Jul 28, 2022

  1. Copy the full SHA
    48cc137 View commit details

Commits on Aug 2, 2022

  1. Copy the full SHA
    3eb67c5 View commit details

Commits on Aug 4, 2022

  1. Copy the full SHA
    30d4498 View commit details

Commits on Aug 11, 2022

  1. Copy the full SHA
    8cf651c View commit details

Commits on Aug 18, 2022

  1. Copy the full SHA
    e3c5253 View commit details

Commits on Aug 20, 2022

  1. Copy the full SHA
    32df06d View commit details
  2. Copy the full SHA
    ed2f423 View commit details

Commits on Aug 21, 2022

  1. Merge pull request #113 from linuxserver/standard-base

    Standard base
    nemchik authored Aug 21, 2022
    Copy the full SHA
    0dd9c4b View commit details
  2. Copy the full SHA
    b7028c9 View commit details
  3. Copy the full SHA
    78bd55b View commit details
  4. Copy the full SHA
    313f1e7 View commit details

Commits on Aug 22, 2022

  1. Merge pull request #130 from linuxserver/config-volume

    Config volume
    nemchik authored Aug 22, 2022
    Copy the full SHA
    df24c38 View commit details

Commits on Aug 23, 2022

  1. nginx conf tweaks

    nemchik committed Aug 23, 2022
    Copy the full SHA
    a50d975 View commit details
  2. Merge pull request #131 from linuxserver/default-tweaks

    nginx conf tweaks
    nemchik authored Aug 23, 2022
    Copy the full SHA
    6b6ecc9 View commit details

Commits on Aug 25, 2022

  1. Copy the full SHA
    8d82576 View commit details

Commits on Sep 8, 2022

  1. Copy the full SHA
    c387f01 View commit details

Commits on Sep 15, 2022

  1. Copy the full SHA
    91408e7 View commit details

Commits on Sep 20, 2022

  1. Copy the full SHA
    99ac907 View commit details

Commits on Sep 22, 2022

  1. Copy the full SHA
    e301c5f View commit details

Commits on Sep 23, 2022

  1. Copy the full SHA
    9cf173b View commit details

Commits on Oct 4, 2022

  1. Add default_server

    nemchik committed Oct 4, 2022
    Copy the full SHA
    b8bd87f View commit details

Commits on Oct 5, 2022

  1. Merge pull request #137 from linuxserver/default_server

    Add default_server
    nemchik authored Oct 5, 2022
    Copy the full SHA
    9ee92d8 View commit details

Commits on Oct 6, 2022

  1. Update default.conf.sample

    nemchik authored Oct 6, 2022
    Copy the full SHA
    06f369e View commit details

Commits on Oct 7, 2022

  1. Merge pull request #139 from linuxserver/fix-date

    Update default.conf.sample
    nemchik authored Oct 7, 2022
    Copy the full SHA
    039f6c4 View commit details
  2. Copy the full SHA
    e192345 View commit details

Commits on Oct 8, 2022

  1. Support DB_PORT

    thohng committed Oct 8, 2022
    Copy the full SHA
    71750e1 View commit details

Commits on Oct 10, 2022

  1. Improve grep and seq matching

    thohng committed Oct 10, 2022
    Copy the full SHA
    5fa1132 View commit details
  2. Update README support DB_PORT

    thohng committed Oct 10, 2022
    Copy the full SHA
    f033396 View commit details
  3. Copy the full SHA
    10f9699 View commit details
  4. Update 50-config

    drizuid authored Oct 10, 2022
    Copy the full SHA
    d385897 View commit details
Showing with 1,802 additions and 1,375 deletions.
  1. +1 −1 .editorconfig
  2. +3 −3 .github/CONTRIBUTING.md
  3. 0 .github/FUNDING.yml
  4. +1 −1 .github/ISSUE_TEMPLATE/config.yml
  5. +0 −40 .github/ISSUE_TEMPLATE/issue.bug.md
  6. +76 −0 .github/ISSUE_TEMPLATE/issue.bug.yml
  7. +0 −25 .github/ISSUE_TEMPLATE/issue.feature.md
  8. +31 −0 .github/ISSUE_TEMPLATE/issue.feature.yml
  9. +19 −0 .github/workflows/call_issue_pr_tracker.yml
  10. +16 −0 .github/workflows/call_issues_cron.yml
  11. +100 −45 .github/workflows/external_trigger.yml
  12. +21 −16 .github/workflows/external_trigger_scheduler.yml
  13. +7 −1 .github/workflows/greetings.yml
  14. +0 −38 .github/workflows/package_trigger.yml
  15. +82 −29 .github/workflows/package_trigger_scheduler.yml
  16. +12 −0 .github/workflows/permissions.yml
  17. +0 −23 .github/workflows/stale.yml
  18. +39 −38 Dockerfile
  19. +39 −38 Dockerfile.aarch64
  20. +0 −66 Dockerfile.armhf
  21. +584 −367 Jenkinsfile
  22. 0 LICENSE
  23. +193 −102 README.md
  24. +4 −4 jenkins-vars.yml
  25. +291 −195 package_versions.txt
  26. +139 −85 readme-vars.yml
  27. +9 −0 root/appkey
  28. +0 −39 root/defaults/default
  29. +0 −98 root/defaults/nginx.conf
  30. +0 −119 root/etc/cont-init.d/50-config
  31. 0 root/etc/s6-overlay/s6-rc.d/init-bookstack-config/dependencies.d/init-nginx-end
  32. +63 −0 root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run
  33. +1 −0 root/etc/s6-overlay/s6-rc.d/init-bookstack-config/type
  34. +1 −0 root/etc/s6-overlay/s6-rc.d/init-bookstack-config/up
  35. 0 root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-bookstack-config
  36. 0 root/etc/s6-overlay/s6-rc.d/svc-memcached/dependencies.d/init-services
  37. +2 −0 root/etc/{services.d/memcached → s6-overlay/s6-rc.d/svc-memcached}/run
  38. +1 −0 root/etc/s6-overlay/s6-rc.d/svc-memcached/type
  39. 0 root/etc/s6-overlay/s6-rc.d/svc-queue-worker/dependencies.d/init-services
  40. +6 −0 root/etc/s6-overlay/s6-rc.d/svc-queue-worker/run
  41. +1 −0 root/etc/s6-overlay/s6-rc.d/svc-queue-worker/type
  42. 0 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-bookstack-config
  43. 0 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-memcached
  44. +0 −2 root/etc/services.d/php-fpm/run
  45. +9 −0 root/init-hook
  46. +11 −0 root/migrations/02-default-location
  47. +40 −0 root/var/www/html/public/index.html
2 changes: 1 addition & 1 deletion .editorconfig
100755 → 100644
Original file line number Diff line number Diff line change
@@ -15,6 +15,6 @@ trim_trailing_whitespace = false
indent_style = space
indent_size = 2

[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}]
[{**.sh,root/etc/s6-overlay/s6-rc.d/**,root/etc/cont-init.d/**,root/etc/services.d/**}]
indent_style = space
indent_size = 4
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING.md
100755 → 100644
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
* Read, and fill the Pull Request template
* If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR
* If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message
* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn)
* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://linuxserver.io/discord)

## Common files

@@ -105,10 +105,10 @@ docker build \
-t linuxserver/bookstack:latest .
```

The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`

```bash
docker run --rm --privileged multiarch/qemu-user-static:register --reset
docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
```

Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
Empty file modified .github/FUNDING.yml
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
blank_issues_enabled: false
contact_links:
- name: Discord chat support
url: https://discord.gg/YWrKVTn
url: https://linuxserver.io/discord
about: Realtime support / chat with the community and the team.

- name: Discourse discussion forum
40 changes: 0 additions & 40 deletions .github/ISSUE_TEMPLATE/issue.bug.md

This file was deleted.

76 changes: 76 additions & 0 deletions .github/ISSUE_TEMPLATE/issue.bug.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Based on the issue template
name: Bug report
description: Create a report to help us improve
title: "[BUG] <title>"
labels: [Bug]
body:
- type: checkboxes
attributes:
label: Is there an existing issue for this?
description: Please search to see if an issue already exists for the bug you encountered.
options:
- label: I have searched the existing issues
required: true
- type: textarea
attributes:
label: Current Behavior
description: Tell us what happens instead of the expected behavior.
validations:
required: true
- type: textarea
attributes:
label: Expected Behavior
description: Tell us what should happen.
validations:
required: false
- type: textarea
attributes:
label: Steps To Reproduce
description: Steps to reproduce the behavior.
placeholder: |
1. In this environment...
2. With this config...
3. Run '...'
4. See error...
validations:
required: true
- type: textarea
attributes:
label: Environment
description: |
examples:
- **OS**: Ubuntu 20.04
- **How docker service was installed**: distro's packagemanager
value: |
- OS:
- How docker service was installed:
render: markdown
validations:
required: false
- type: dropdown
attributes:
label: CPU architecture
options:
- x86-64
- arm64
validations:
required: true
- type: textarea
attributes:
label: Docker creation
description: |
Command used to create docker container
Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container
render: bash
validations:
required: true
- type: textarea
attributes:
description: |
Provide a full docker log, output of "docker logs bookstack"
label: Container logs
placeholder: |
Output of `docker logs bookstack`
render: bash
validations:
required: true
25 changes: 0 additions & 25 deletions .github/ISSUE_TEMPLATE/issue.feature.md

This file was deleted.

31 changes: 31 additions & 0 deletions .github/ISSUE_TEMPLATE/issue.feature.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Based on the issue template
name: Feature request
description: Suggest an idea for this project
title: "[FEAT] <title>"
labels: [enhancement]
body:
- type: checkboxes
attributes:
label: Is this a new feature request?
description: Please search to see if a feature request already exists.
options:
- label: I have searched the existing issues
required: true
- type: textarea
attributes:
label: Wanted change
description: Tell us what you want to happen.
validations:
required: true
- type: textarea
attributes:
label: Reason for change
description: Justify your request, why do you want it, what is the benefit.
validations:
required: true
- type: textarea
attributes:
label: Proposed code change
description: Do you have a potential code change in mind?
validations:
required: false
19 changes: 19 additions & 0 deletions .github/workflows/call_issue_pr_tracker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Issue & PR Tracker

on:
issues:
types: [opened,reopened,labeled,unlabeled,closed]
pull_request_target:
types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled,closed]
pull_request_review:
types: [submitted,edited,dismissed]

permissions:
contents: read

jobs:
manage-project:
permissions:
issues: write
uses: linuxserver/github-workflows/.github/workflows/issue-pr-tracker.yml@v1
secrets: inherit
16 changes: 16 additions & 0 deletions .github/workflows/call_issues_cron.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Mark stale issues and pull requests
on:
schedule:
- cron: '3 9 * * *'
workflow_dispatch:

permissions:
contents: read

jobs:
stale:
permissions:
issues: write
pull-requests: write
uses: linuxserver/github-workflows/.github/workflows/issues-cron.yml@v1
secrets: inherit
Loading