Fix issue with mime type on login route. Update container instructions

This commit is contained in:
Alicia
2024-04-13 11:15:15 -07:00
parent 16fc58cc49
commit 3051df7a0d
5 changed files with 35 additions and 3 deletions

20
CONTAINER.md Normal file
View File

@@ -0,0 +1,20 @@
# Maintainer instructions on how to update the docker container
Build the container
`docker build .`
Find the line in the output after the prod container has been built (it's the middle one after build and before dev), grab it's sha.
You can run `docker images` to check that it matches.
Tag the image
`docker tag codeberg.org/boxedtoast/slidgevoipms:latest <IMAGE ID>`
Login to codeberg (if you haven't already)
`docker login codeberg.org`
Push the image
`docker push codeberg.org/boxedtoast/slidgevoipms:latest`

View File

@@ -11,5 +11,4 @@ for general info on how to set up an XMPP server component.
### Containers ### Containers
Containers are not available on docker.io yet, but can be built locally from the Dockerfile. The container is available on codeberg. See the `docker-compose-prod.yml` for an example of how to pull it in.
The docker-compose.yml will bring up a development instance of slidge and prosody.

11
docker-compose-prod.yml Normal file
View File

@@ -0,0 +1,11 @@
slidgevoipms:
image: codeberg.org/boxedtoast/slidgevoipms:latest
container_name: slidgevoipms
restart: unless-stopped
networks:
- xmpp # should be the same one as your XMPP server
volumes:
- ./slidgevoipms.conf:/etc/slidge/conf.d/slidgevoipms.conf:ro
- ./slidgevoipmsattachments:/slidge-web # attachment directory
- ./slidgevoipmsdata:/var/lib/slidge:rw # slidge databases

View File

@@ -57,7 +57,9 @@ class Gateway(BaseGateway):
'method': 'getDIDsInfo', 'method': 'getDIDsInfo',
'content_type': 'json', 'content_type': 'json',
}) as response: }) as response:
json = await response.json() # For whatever cursed reason, this call sometimes returns with
# text/html as the content type, so we disable the check
json = await response.json(content_type=None)
if json['status'] == 'success': if json['status'] == 'success':
return return
else: else: