forked from mirror/prosody
replace master with dev
This commit is contained in:
Sara Aimée Smiseth
parent
5a963e31a8
commit
dbb91cbe5b
3 changed files with 18 additions and 23 deletions
24
.github/workflows/docker-publish.yml
vendored
24
.github/workflows/docker-publish.yml
vendored
|
|
@ -2,11 +2,11 @@ name: Docker
|
|||
|
||||
on:
|
||||
schedule:
|
||||
- cron: '0 1 * * *'
|
||||
- cron: "0 1 * * *"
|
||||
pull_request:
|
||||
branches: master
|
||||
branches: dev
|
||||
push:
|
||||
branches: master
|
||||
branches: dev
|
||||
tags:
|
||||
- v*
|
||||
|
||||
|
|
@ -18,8 +18,7 @@ jobs:
|
|||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
-
|
||||
name: Prepare
|
||||
- name: Prepare
|
||||
id: prepare
|
||||
run: |
|
||||
DOCKER_IMAGE=sarasmiseth/prosody
|
||||
|
|
@ -46,30 +45,25 @@ jobs:
|
|||
id: buildx
|
||||
uses: crazy-max/ghaction-docker-buildx@v3.1.0
|
||||
|
||||
-
|
||||
name: Docker Buildx (build)
|
||||
- name: Docker Buildx (build)
|
||||
run: |
|
||||
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'
|
||||
env:
|
||||
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
||||
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
|
||||
run: |
|
||||
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'
|
||||
run: |
|
||||
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'
|
||||
run: |
|
||||
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'
|
||||
run: |
|
||||
rm -f ${HOME}/.docker/config.json
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
# Changelog
|
||||
|
||||
## Unreleased
|
||||
* Replace "master" with "dev".
|
||||
|
||||
## v1.1.0
|
||||
|
||||
|
|
|
|||
16
readme.md
16
readme.md
|
|
@ -1,6 +1,6 @@
|
|||
# Prosody XMPP Docker image
|
||||
|
||||
|
||||
|
||||
[](https://microbadger.com/images/sarasmiseth/prosody:latest)
|
||||
[](https://hub.docker.com/r/sarasmiseth/prosody/)
|
||||
[](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>
|
||||
|
||||
| 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. |
|
||||
| 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. |
|
||||
| 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). |
|
||||
| Tag | Description |
|
||||
| -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
|
||||
| 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/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). |
|
||||
| *vX.Y.Z* | There is a tag for each [release](https://github.com/SaraSmiseth/prosody/releases). |
|
||||
|
||||
### 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 |
|
||||
| **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 |
|
||||
| **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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue