From dbb91cbe5b1e6312d9f2f5ef3289842052c29ac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sara=20Aim=C3=A9e=20Smiseth?= <51710585+SaraSmiseth@users.noreply.github.com> Date: Sun, 12 Jul 2020 17:44:40 +0200 Subject: [PATCH] replace master with dev --- .github/workflows/docker-publish.yml | 24 +++++++++--------------- CHANGELOG.md | 1 + readme.md | 16 ++++++++-------- 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index ef92ef7..f598ec0 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -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 diff --git a/CHANGELOG.md b/CHANGELOG.md index a10c92e..9739c85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog ## Unreleased +* Replace "master" with "dev". ## v1.1.0 diff --git a/readme.md b/readme.md index 59a8541..9f0e227 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,6 @@ # 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 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/) @@ -172,12 +172,12 @@ Inspect logs: ```docker-compose logs -f```. -| 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