mirror/prosody
1
0
Fork 1
mirror of https://github.com/SaraSmiseth/prosody.git synced 2025-01-18 13:10:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

replace master with dev

Browse source
This commit is contained in:
Sara Aimée Smiseth 2020-07-12 17:44:40 +02:00
parent 5a963e31a8
commit dbb91cbe5b
3 changed files with 18 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
.github/workflows/docker-publish.yml vendored
View file

@ -2,11 +2,11 @@ name: Docker
on: on:
schedule: schedule:
- cron: '0 1 * * *' - cron: "0 1 * * *"
pull_request: pull_request:
branches: master branches: dev
push: push:
branches: master branches: dev
tags: tags:
- v* - v*
@ -18,8 +18,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- - name: Prepare
name: Prepare
id: prepare id: prepare
run: | run: |
DOCKER_IMAGE=sarasmiseth/prosody DOCKER_IMAGE=sarasmiseth/prosody
@ -46,30 +45,25 @@ jobs:
id: buildx id: buildx
uses: crazy-max/ghaction-docker-buildx@v3.1.0 uses: crazy-max/ghaction-docker-buildx@v3.1.0
- - name: Docker Buildx (build)
name: Docker Buildx (build)
run: | run: |
docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }} docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }}
- - name: Docker Login
name: Docker Login
if: success() && github.event_name != 'pull_request' if: success() && github.event_name != 'pull_request'
env: env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
run: | run: |
echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
- - name: Docker Buildx (push)
name: Docker Buildx (push)
if: success() && github.event_name != 'pull_request' if: success() && github.event_name != 'pull_request'
run: | run: |
docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }} docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }}
- - name: Docker Check Manifest
name: Docker Check Manifest
if: always() && github.event_name != 'pull_request' if: always() && github.event_name != 'pull_request'
run: | run: |
docker run --rm mplatform/mquery ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }} docker run --rm mplatform/mquery ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}
- - name: Clear
name: Clear
if: always() && github.event_name != 'pull_request' if: always() && github.event_name != 'pull_request'
run: | run: |
rm -f ${HOME}/.docker/config.json rm -f ${HOME}/.docker/config.json

1
CHANGELOG.md
View file

@ -1,6 +1,7 @@
# Changelog # Changelog
## Unreleased ## Unreleased
* Replace "master" with "dev".
## v1.1.0 ## v1.1.0

16
readme.md
View file

@ -1,6 +1,6 @@
# Prosody XMPP Docker image # Prosody XMPP Docker image
![Docker](https://github.com/SaraSmiseth/prosody/workflows/Docker/badge.svg?branch=master) ![Docker](https://github.com/SaraSmiseth/prosody/workflows/Docker/badge.svg?branch=dev)
[![docker image](https://images.microbadger.com/badges/image/sarasmiseth/prosody:latest.svg)](https://microbadger.com/images/sarasmiseth/prosody:latest) [![docker image](https://images.microbadger.com/badges/image/sarasmiseth/prosody:latest.svg)](https://microbadger.com/images/sarasmiseth/prosody:latest)
[![docker pulls](https://img.shields.io/docker/pulls/sarasmiseth/prosody.svg)](https://hub.docker.com/r/sarasmiseth/prosody/) [![docker pulls](https://img.shields.io/docker/pulls/sarasmiseth/prosody.svg)](https://hub.docker.com/r/sarasmiseth/prosody/)
[![docker stars](https://img.shields.io/docker/stars/sarasmiseth/prosody.svg)](https://hub.docker.com/r/sarasmiseth/prosody/) [![docker stars](https://img.shields.io/docker/stars/sarasmiseth/prosody.svg)](https://hub.docker.com/r/sarasmiseth/prosody/)
@ -172,12 +172,12 @@ Inspect logs: ```docker-compose logs -f```.
<https://hub.docker.com/r/sarasmiseth/prosody/tags> <https://hub.docker.com/r/sarasmiseth/prosody/tags>
| Tag | Description | | Tag | Description |
| -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
| edge | This tag points to the latest version build from the newest [commit](https://github.com/SaraSmiseth/prosody/commits/master) in the master branch. | | edge | This tag points to the latest version build from the newest [commit](https://github.com/SaraSmiseth/prosody/commits/dev) in the dev branch. |
| nightly | This tag points to the latest version build from the newest [commit](https://github.com/SaraSmiseth/prosody/commits/master) in the master branch. It gets rebuild every night. | | nightly | This tag points to the latest version build from the newest [commit](https://github.com/SaraSmiseth/prosody/commits/dev) in the dev branch. It gets rebuild every night. |
| latest | This tag points to the latest version build from the latest commit that is tagged in git. See [releases](https://github.com/SaraSmiseth/prosody/releases). | | latest | This tag points to the latest version build from the latest commit that is tagged in git. See [releases](https://github.com/SaraSmiseth/prosody/releases). |
| *vX.Y.Z* | There is a tag for each [release](https://github.com/SaraSmiseth/prosody/releases). | | *vX.Y.Z* | There is a tag for each [release](https://github.com/SaraSmiseth/prosody/releases). |
### Configuration ### Configuration
@ -195,7 +195,7 @@ Inspect logs: ```docker-compose logs -f```.
| **C2S_REQUIRE_ENCRYPTION** | Whether to force all client-to-server connections to be encrypted or not | *optional* | true | | **C2S_REQUIRE_ENCRYPTION** | Whether to force all client-to-server connections to be encrypted or not | *optional* | true |
| **S2S_REQUIRE_ENCRYPTION** | Whether to force all server-to-server connections to be encrypted or not | *optional* | true | | **S2S_REQUIRE_ENCRYPTION** | Whether to force all server-to-server connections to be encrypted or not | *optional* | true |
| **S2S_SECURE_AUTH** | Require encryption and certificate authentication | *optional* | true | | **S2S_SECURE_AUTH** | Require encryption and certificate authentication | *optional* | true |
| **PROSODY_ADMINS** | Specify who is an administrator. List of adresses. Eg. "me@example.com", "admin@example.net" | *optional* | "" | | **PROSODY_ADMINS** | Specify who is an administrator. List of adresses. Eg. "me@example.com", "admin@example.net" | *optional* | "" |
#### DNS #### DNS