replace master with dev

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

View file

@ -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