Skip to content

Commit dcb5e31

Browse files
authored
Merge branch 'master' into forgotPassword
2 parents c7279ef + 41f0a1d commit dcb5e31

File tree

3 files changed

+61
-1
lines changed

3 files changed

+61
-1
lines changed

.github/workflows/docker-publish.yml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: docker
2+
3+
on:
4+
schedule:
5+
- cron: '19 17 * * *' # Nightly builds capture upstream updates to dependency images such as node.
6+
push:
7+
branches: [ master, 'release-*.*.*' ]
8+
tags: [ '*.*.*' ]
9+
10+
env:
11+
REGISTRY: docker.io
12+
IMAGE_NAME: parseplatform/parse-server
13+
14+
jobs:
15+
build:
16+
17+
runs-on: ubuntu-18.04
18+
permissions:
19+
contents: read
20+
packages: write
21+
22+
steps:
23+
- name: Determine branch name
24+
id: branch
25+
run: echo ::set-output name=branch_name::${GITHUB_REF#refs/*/}
26+
27+
- name: Checkout repository
28+
uses: actions/checkout@v2
29+
30+
- name: Set up QEMU
31+
id: qemu
32+
uses: docker/setup-qemu-action@v1
33+
34+
- name: Set up Docker Buildx
35+
uses: docker/setup-buildx-action@v1
36+
37+
- name: Log into Docker Hub
38+
if: github.event_name != 'pull_request'
39+
uses: docker/login-action@v1
40+
with:
41+
username: ${{ secrets.DOCKERHUB_USERNAME }}
42+
password: ${{ secrets.DOCKERHUB_TOKEN }}
43+
44+
- name: Extract Docker metadata
45+
id: meta
46+
uses: docker/metadata-action@v3
47+
with:
48+
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
49+
flavor: |
50+
latest=${{ steps.branch.branch_name == 'master' }}
51+
52+
- name: Build and push Docker image
53+
uses: docker/build-push-action@v2
54+
with:
55+
context: .
56+
platforms: linux/amd64, linux/arm/v6, linux/arm/v7, linux/arm64/v8
57+
push: ${{ github.event_name != 'pull_request' }}
58+
tags: ${{ steps.meta.outputs.tags }}
59+
labels: ${{ steps.meta.outputs.labels }}

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ ___
151151
- Refactor: uniform issue templates across repos (Manuel Trezza) [#7528](https://github.com/parse-community/parse-server/pull/7528)
152152
- ci: bump ci environment (Manuel Trezza) [#7539](https://github.com/parse-community/parse-server/pull/7539)
153153
- Added Parse Server Option `passwordPolicy.resetPasswordSuccessOnInvalidEmail` (Daniel Blyth) [#7551](https://github.com/parse-community/parse-server/pull/7551)
154+
- CI now pushes docker images to Docker Hub (Corey Baker) [#7548](https://github.com/parse-community/parse-server/pull/7548)
154155

155156
## 4.10.3
156157
[Full Changelog](https://github.com/parse-community/parse-server/compare/4.10.2...4.10.3)

src/LiveQuery/ParseWebSocketServer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export class ParseWebSocketServer {
1111
config.server = server;
1212
const wss = loadAdapter(config.wssAdapter, WSAdapter, config);
1313
wss.onListen = () => {
14-
logger.info('Parse LiveQuery Server starts running');
14+
logger.info('Parse LiveQuery Server started running');
1515
};
1616
wss.onConnection = ws => {
1717
ws.on('error', error => {

0 commit comments

Comments
 (0)