Skip to content

Commit eb2828c

Browse files
authored
Merge branch 'master' into codex/add-post-build-test-for-docker-image
2 parents f1ec78f + fe16d2e commit eb2828c

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.github/workflows/docker.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ jobs:
1313
- uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
1414

1515
- name: Login to dockerhub
16-
if: github.ref == 'refs/heads/master'
16+
if: github.ref == format('refs/heads/{0}', github.event.repository.default_branch)
1717
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
1818
with:
1919
username: ${{ secrets.DOCKER_USERNAME }}
2020
password: ${{ secrets.DOCKER_PASSWORD }}
2121

2222
- name: Login to GitHub
23-
if: github.ref == 'refs/heads/master'
23+
if: github.ref == format('refs/heads/{0}', github.event.repository.default_branch)
2424
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
2525
with:
2626
registry: ghcr.io
@@ -40,10 +40,11 @@ jobs:
4040
type=edge,branch=$repo.default_branch
4141
4242
- name: build+push
43+
if: github.ref == format('refs/heads/{0}', github.event.repository.default_branch)
4344
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
4445
with:
4546
platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
46-
push: ${{ github.ref == 'refs/heads/master' }}
47+
push: ${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
4748
tags: ${{ steps.docker_meta.outputs.tags }}
4849
labels: ${{ steps.docker_meta.outputs.labels }}
4950

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Our Pledge
44

55
In the interest of fostering an open and welcoming environment, we as
6-
contributors and maintainers pledge to making participation in our project and
6+
contributors and maintainers pledge to make participation in our project and
77
our community a harassment-free experience for everyone, regardless of age, body
88
size, disability, ethnicity, sex characteristics, gender identity and expression,
99
level of experience, education, socio-economic status, nationality, personal

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Docker wrapper for https://github.com/jishi/node-sonos-http-api
77
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/chrisns/docker-node-sonos-http-api/master/LICENSE)
88
[![Docker Stars](https://img.shields.io/docker/stars/chrisns/docker-node-sonos-http-api.svg)](https://hub.docker.com/r/chrisns/docker-node-sonos-http-api)
99
[![Docker Pulls](https://img.shields.io/docker/pulls/chrisns/docker-node-sonos-http-api.svg)](https://hub.docker.com/r/chrisns/docker-node-sonos-http-api)
10-
[![Docker Automated buil](https://img.shields.io/docker/automated/chrisns/docker-node-sonos-http-api.svg)](https://hub.docker.com/r/chrisns/docker-node-sonos-http-api)
10+
[![Docker Automated build](https://img.shields.io/docker/automated/chrisns/docker-node-sonos-http-api.svg)](https://hub.docker.com/r/chrisns/docker-node-sonos-http-api)
1111
![Docker Image CI](https://github.com/chrisns/docker-node-sonos-http-api/workflows/Docker%20Image%20CI/badge.svg?branch=master)
1212

1313
## Usage

0 commit comments

Comments
 (0)