Commit Graph

25 Commits

Author SHA1 Message Date
tomtjes
51620a34d9 add swag config example 2022-01-14 15:10:22 -05:00
MaxJa4
dc10bf2c49
Add general note and remove duplicate subchapter from docker installation docs
Add general note and remove duplicate subchapter from docker installation docs
2022-01-12 21:55:31 +01:00
MaxJa4
79c8edd354
Some additional info for reverse proxy setups.
Since there have been quite some people with basic docker setup issues when using a reverse proxy and very basic reverse proxies like a nginx running locally as a proxy or Caddy, I figured these added sentences might clear things up for some people.
Feel free to suggest additional topics which should be added or refined.
2022-01-07 20:14:49 +01:00
vabene1111
4047febec9
Merge branch 'develop' into feature/shopping_list_v2 2022-01-04 07:58:36 +01:00
smilerz
582e145a9f Fix after rebase 2021-12-30 13:55:38 -06:00
vabene1111
3743a08996 marked required env fields 2021-12-30 09:47:36 +01:00
vabene1111
ccd0966d92 Merge branch 'feature/shopping_list_v2' of https://github.com/vabene1111/recipes into feature/shopping_list_v2
# Conflicts:
#	cookbook/static/django_js_reverse/reverse.js
#	cookbook/tests/api/test_api_shopping_recipe.py
#	vue/src/apps/ShoppingListView/ShoppingListView.vue
2021-12-29 15:26:22 +01:00
smilerz
c43b8e91da Fix after rebase 2021-12-28 12:05:14 -06:00
smilerz
9794d544cc Squashed commit of the following:
commit 7837467c30
Merge: aaaae5b1b 84759383f
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Sat Dec 18 23:14:24 2021 +0100

    Merge pull request #1146 from auanasgheps/patch-1

    Add documentation about swag by linuxserver

commit 84759383fa
Author: Oliver Cervera <cervera93-19@yahoo.it>
Date:   Sat Dec 18 13:49:09 2021 +0100

    Add documentation about swag by linuxserver

    Documents behaviour in #959

commit aaaae5b1ba
Merge: 4a747f5cd ea62c10d9
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Thu Dec 16 18:10:48 2021 +0100

    Merge pull request #1143 from smilerz/fix_get_facet_api

    fix bug in get_facet_api

commit ea62c10d9a
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 16 09:20:56 2021 -0600

    remove console message

commit 3516505dd1
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 16 09:08:32 2021 -0600

    fix bug in get_facet_api
2021-12-28 12:03:35 -06:00
smilerz
75b45ba8eb Squashed commit of the following:
commit 7837467c30
Merge: aaaae5b1b 84759383f
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Sat Dec 18 23:14:24 2021 +0100

    Merge pull request #1146 from auanasgheps/patch-1

    Add documentation about swag by linuxserver

commit 84759383fa
Author: Oliver Cervera <cervera93-19@yahoo.it>
Date:   Sat Dec 18 13:49:09 2021 +0100

    Add documentation about swag by linuxserver

    Documents behaviour in #959

commit aaaae5b1ba
Merge: 4a747f5cd ea62c10d9
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Thu Dec 16 18:10:48 2021 +0100

    Merge pull request #1143 from smilerz/fix_get_facet_api

    fix bug in get_facet_api

commit ea62c10d9a
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 16 09:20:56 2021 -0600

    remove console message

commit 3516505dd1
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 16 09:08:32 2021 -0600

    fix bug in get_facet_api
2021-12-20 15:26:31 -06:00
Oliver Cervera
e470a70321
punctuation fixes
First commit was done in rush. Fixed a couple of punctuations.
2021-12-20 11:09:05 +01:00
Oliver Cervera
84759383fa
Add documentation about swag by linuxserver
Documents behaviour in #959
2021-12-18 13:49:09 +01:00
tuxuser
b6eba9c5e7 Docs: Fix inline include of yaml files 2021-11-13 10:36:14 +01:00
tuxuser
9d827ac174 Docs: Inline docker-compose.yaml files in the documentation 2021-11-13 10:35:55 +01:00
vabene1111
6cb9a7068e
Revert "Docs: Inline docker-compose.yaml files in the documentation" 2021-11-13 09:19:34 +01:00
tuxuser
ea377c2f3b Docs: Inline docker-compose.yaml files in the documentation 2021-11-12 14:41:33 +01:00
vabene1111
6192277778 working on authentication 2021-01-28 15:11:38 +01:00
vabene1111
63cfa14a21 allauth working and integrated 2021-01-28 13:40:07 +01:00
vabene1111
7a1ee9a9b2 fixed documentation mistake (again) 2021-01-17 14:06:56 +01:00
enrico-kaack
0c39ddcf66
Fixed: inconsistent volume naming as mentioned in #317 2021-01-10 22:56:18 +01:00
vabene1111
ba9d85dfc9 updated docker configs 2021-01-07 15:24:56 +01:00
Kyle Johnston
924576c8ba Correct mistake on ports, clarify documentation
My understanding is if you want to access the app on port 3000, you
would use `docker run -d -p 3000:8080 ...` for a Docker command. For
Docker Compose, it's:
```
nginx_recipes:
  ports:
  - 3000:80
```
2021-01-06 07:30:10 -05:00
Kyle Johnston
54f85196e7 Fix Docker install instructions
Not having the backslashes for the `docker run` command resulted in an
error.

Using `80:80` is ignored. While it will work on port 80, it fails when
using any other port such as `3000:80`. Using `3000:8080` works.

Volumes should have a colon on the end, otherwise you get a `ERROR:
yaml.scanner.ScannerError: mapping values are not allowed here`

That said, the new Docker install isn't working for me yet, but I love
the idea of bundling the nginx files with the recipes container.
2021-01-05 21:50:56 -05:00
Kyle Johnston
a1093ed918 Fix documentation formatting
Mostly just typos and some minor changes to help new users less familiar
with Docker tools. I preserved the original style as much as possible.
2021-01-05 21:19:16 -05:00
vabene1111
b90c70b2a3 huge documentation and setup restructure 2021-01-05 10:38:18 +01:00