diff options
| author |  thursday <xthursdayx@mailbox.org> | 2021-11-23 10:57:35 -0500 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-11-23 10:57:35 -0500 |
| commit | f21deaf3d36c1dcca76018359c86985fea73b503 (patch) | |
| tree | ff68a388fde94863dd426862e129400c1605376d | |
| parent | Update build-and-publish.yml (diff) | |
| parent | Merge branch 'main' into master (diff) | |
| download | ferdium-server-f21deaf3d36c1dcca76018359c86985fea73b503.tar.gz ferdium-server-f21deaf3d36c1dcca76018359c86985fea73b503.tar.zst ferdium-server-f21deaf3d36c1dcca76018359c86985fea73b503.zip | |
Merge pull request #3 from getferdi/master
Merge with upstream.
| -rw-r--r-- | .github/workflows/build-and-publish.yml | 2 | ||||
| -rw-r--r-- | docker/README.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index bd24f9c..d40056a 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml | |||
| @@ -46,7 +46,7 @@ jobs: | |||
| 46 | with: | 46 | with: |
| 47 | registry: ghcr.io | 47 | registry: ghcr.io |
| 48 | username: ${{ github.repository_owner }} | 48 | username: ${{ github.repository_owner }} |
| 49 | password: ${{ secrets.GITHUB_TOKEN }} | 49 | password: ${{ secrets.GH_TOKEN }} |
| 50 | 50 | ||
| 51 | - name: Build and push | 51 | - name: Build and push |
| 52 | id: docker_build | 52 | id: docker_build |
diff --git a/docker/README.md b/docker/README.md index 0128cb6..98877f4 100644 --- a/docker/README.md +++ b/docker/README.md | |||
| @@ -98,7 +98,7 @@ Container images are configured using parameters passed at runtime (such as thos | |||
| 98 | | `-e IS_DASHBOARD_ENABLED=true` | for specifying whether to enable the Ferdi-server dashboard, default is true | | 98 | | `-e IS_DASHBOARD_ENABLED=true` | for specifying whether to enable the Ferdi-server dashboard, default is true | |
| 99 | | `-e IS_REGISTRATION_ENABLED=true` | for specifying whether to allow user registration, default is true | | 99 | | `-e IS_REGISTRATION_ENABLED=true` | for specifying whether to allow user registration, default is true | |
| 100 | | `-e CONNECT_WITH_FRANZ=true` | for specifying whether to enable connections to the Franz server, default is true | | 100 | | `-e CONNECT_WITH_FRANZ=true` | for specifying whether to enable connections to the Franz server, default is true | |
| 101 | | `-e DATA_DIR=data` | for specifying the SQLite database folder, default is data | | 101 | | `-e DATA_DIR=/data` | for specifying the SQLite database folder, default is /data | |
| 102 | | `-v <path to data on host>:/data` | this will store Ferdi-server's data (its database, among other things) on the docker host for persistence. See the [Docker docs](https://docs.docker.com/storage/volumes/) for more information on the use of container volumes | | 102 | | `-v <path to data on host>:/data` | this will store Ferdi-server's data (its database, among other things) on the docker host for persistence. See the [Docker docs](https://docs.docker.com/storage/volumes/) for more information on the use of container volumes | |
| 103 | | `-v <path to recipes on host>:/app/recipes` | this will store Ferdi-server's recipes on the docker host for persistence | | 103 | | `-v <path to recipes on host>:/app/recipes` | this will store Ferdi-server's recipes on the docker host for persistence | |
| 104 | 104 | ||