Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Diff #1

Draft
wants to merge 141 commits into
base: alpha
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
141 commits
Select commit Hold shift + click to select a range
fb33713
prepend className to unique index to allow multiple unique indexes fo…
cbaker6 Jun 19, 2020
192eb35
add unique index fix to postgres and bump pg-promise up
cbaker6 Jun 21, 2020
58605b4
update package-lock.json
cbaker6 Jun 21, 2020
839cee8
add testcase
cbaker6 Jun 22, 2020
74bc9ec
switched test so it can be tested on older versions of parse-server a…
cbaker6 Jun 22, 2020
832f645
get rid of console log messages on restart by checking if the index e…
cbaker6 Jun 24, 2020
08318da
Merge branch 'fix_unique_index' into docker
cbaker6 Jun 24, 2020
9b34990
add IF NOT EXISTS and IF EXISTS to ALTER TABLE
cbaker6 Jun 24, 2020
10ad0fc
Merge branch 'fix_unique_index' into docker
cbaker6 Jun 24, 2020
d2432c7
revert some of code
cbaker6 Jun 24, 2020
7aace75
revert some of code
cbaker6 Jun 24, 2020
15afb26
Merge branch 'fix_unique_index' into docker
cbaker6 Jun 24, 2020
533ca0a
ensureIndex use IF NOT EXISTS
cbaker6 Jun 24, 2020
84d5d1f
ALTER TABLE CONSTRAINT can't use IF, ADD/DROP COLUMN can
cbaker6 Jun 24, 2020
b0f781d
retesting
cbaker6 Jun 24, 2020
e1bafd7
update
cbaker6 Jun 24, 2020
1481aba
switchted to CREATE UNIQUE INDEX instrad of ALTER TABLE... ALTER TABL…
cbaker6 Jun 24, 2020
1b8efad
Merge branch 'fix_unique_index' into docker
cbaker6 Jun 24, 2020
29bcba9
Merge branch 'master' into docker
cbaker6 Jun 30, 2020
6b67a42
switch to updated fs-adapter
cbaker6 Jun 30, 2020
5a15f98
add fileKey encryption to GridFSBucketStorageAdapter
cbaker6 Jun 30, 2020
5a418c0
Merge branch 'encrypt' into docker
cbaker6 Jun 30, 2020
18ae9ce
remove fileAdapter options from test spec
cbaker6 Jun 30, 2020
451693c
ensure promise doesn't fall through in getFileData
cbaker6 Jun 30, 2020
6fb4eec
Merge branch 'encrypt' into docker
cbaker6 Jun 30, 2020
38422d1
switch secretKey to fileKey
cbaker6 Jul 1, 2020
10fb659
add fileKey rotation for GridFSBucketAdapter
cbaker6 Jul 2, 2020
10460f2
Merge branch 'master' into rotate_keys
cbaker6 Jul 2, 2020
d48f4cb
Merge branch 'rotate_keys' into docker
cbaker6 Jul 2, 2020
b822e5a
improve catching decryption errors in testcases
cbaker6 Jul 2, 2020
113274a
add testcase for rotating key from oldKey to noKey leaving all files …
cbaker6 Jul 2, 2020
d4452da
removed fileKey from legacy test links. From the looks of the tests a…
cbaker6 Jul 2, 2020
56f0fca
Merge branch 'rotate_keys' into docker
cbaker6 Jul 2, 2020
f6a8474
merge with master
cbaker6 Jul 3, 2020
5006b0f
clean up code
cbaker6 Jul 4, 2020
95aee9c
Merge branch 'rotate_keys' into docker
cbaker6 Jul 4, 2020
0462bc5
updated pg-promise to latest
cbaker6 Jul 8, 2020
d5bf059
update
cbaker6 Jul 8, 2020
cb0abba
merge
cbaker6 Jul 14, 2020
3e65567
merge with upstream master
cbaker6 Jul 29, 2020
aaf8083
merge with upstream master
cbaker6 Jul 29, 2020
2ac8a3e
fix merge upgrade pg-promise
cbaker6 Sep 12, 2020
f96c24a
merge latest parse updates
cbaker6 Sep 29, 2020
a3b7fcf
merged with upstream
cbaker6 Oct 12, 2020
504baf8
merge master
cbaker6 Oct 26, 2020
fe2e065
update fsAdapter to point to npm
cbaker6 Oct 26, 2020
dd7f3c6
Merge branch 'master' into docker
cbaker6 Oct 27, 2020
aed14e4
Merge branch 'master' into docker
cbaker6 Oct 29, 2020
09eca34
Merge branch 'docker' of https://github.com/netreconlab/parse-server …
cbaker6 Oct 29, 2020
bfd3f9e
Merge branch 'master' into docker
cbaker6 Oct 31, 2020
bd2be54
Merge branch 'master' into docker
cbaker6 Nov 2, 2020
54ff7cb
Merge branch 'master' into docker
cbaker6 Nov 3, 2020
364f396
Merge branch 'master' into docker
cbaker6 Nov 11, 2020
96897ec
Merge branch 'master' into docker
cbaker6 Nov 22, 2020
97457fd
Merge branch 'master' into docker
cbaker6 Dec 2, 2020
6c79903
update pg-promise
cbaker6 Dec 2, 2020
8f69721
Merge branch 'docker' of https://github.com/netreconlab/parse-server …
cbaker6 Dec 2, 2020
35899ce
remove mongo runner because it's causing docker issues
cbaker6 Dec 2, 2020
f031cca
merge with latest
cbaker6 Dec 5, 2020
55522a9
reverted to origina parse files
cbaker6 Dec 5, 2020
a679e5c
reverted to origina parse files
cbaker6 Dec 5, 2020
4f425ee
Merge remote-tracking branch 'upstream/master' into docker
cbaker6 Dec 15, 2020
d693b30
match main branch
cbaker6 Dec 15, 2020
f5b683c
match main branch
cbaker6 Dec 15, 2020
3901a17
Merge branch 'master' into docker
cbaker6 Dec 16, 2020
58bedf0
Merge branch 'master' into docker
cbaker6 Jan 11, 2021
05cda0a
add eq to liveQuery
cbaker6 Jan 11, 2021
9377f8f
fix eq in livequery
cbaker6 Jan 11, 2021
74f557a
revert liveQuery change
cbaker6 Jan 11, 2021
b01c95e
Merge branch 'master' into docker
cbaker6 Mar 3, 2021
4cd9add
fix select and exclude
cbaker6 Mar 5, 2021
e99abb0
Merge branch 'master' into docker
cbaker6 Mar 5, 2021
47b47c4
add original package files
cbaker6 Mar 5, 2021
4208d38
add support for select([])
cbaker6 Mar 5, 2021
89d0cad
update keys
cbaker6 Mar 6, 2021
6ca47aa
update keys
cbaker6 Mar 6, 2021
0e1c6c7
update keys
cbaker6 Mar 6, 2021
187b219
update exclude
cbaker6 Mar 7, 2021
1f3e77b
update
cbaker6 Mar 9, 2021
9dd5db2
revert
cbaker6 Mar 9, 2021
7b7457e
Implement OAuth method
seasonsolution Mar 10, 2021
8c8ff9f
Revert "Implement OAuth method"
seasonsolution Mar 10, 2021
a607398
Update CHANGELOG.md
seasonsolution Mar 10, 2021
7e59d29
Revert "Revert "Implement OAuth method""
seasonsolution Mar 10, 2021
25e5ec4
Fix definitions params
seasonsolution Mar 10, 2021
97826d5
Merge branch 'master' into origin/issue7248
jjunineuro Mar 10, 2021
4c2caad
Remove comments and fix signup
seasonsolution Mar 11, 2021
0574192
Test codecov 1
seasonsolution Mar 12, 2021
2f71ecb
Change name of variables
seasonsolution Mar 13, 2021
de9e398
Update helper.js
seasonsolution Mar 13, 2021
6d8efae
Update UsersRouter.js
seasonsolution Mar 13, 2021
cfc6157
Merge remote-tracking branch 'oauth/origin/issue7248' into docker
cbaker6 Mar 15, 2021
9b80455
initial tests
dplewis Mar 15, 2021
ae9b7a3
Merge branch 'master' into origin/issue7248
dplewis Mar 15, 2021
87419fb
send expiresAt response as date
cbaker6 Mar 16, 2021
77c5cc4
update testcase
cbaker6 Mar 16, 2021
557e92f
fix time declaration
cbaker6 Mar 16, 2021
cc064f3
Merge remote-tracking branch 'oauth/origin/issue7248' into docker
cbaker6 Mar 16, 2021
4a0d22a
Fix expiresAt param
seasonsolution Mar 21, 2021
311bfc8
Merge remote-tracking branch 'oauth/origin/issue7248' into docker
cbaker6 Mar 22, 2021
094f37f
merge conflict
cbaker6 Sep 4, 2021
baaff3d
push docker images
cbaker6 Sep 4, 2021
f439649
Update docker-publish.yml
cbaker6 Sep 5, 2021
5848023
add multi-platform
cbaker6 Sep 5, 2021
7f77929
remove arm7
cbaker6 Sep 5, 2021
bcdc18c
remove flavor
cbaker6 Sep 7, 2021
23b859b
fix docker
cbaker6 Sep 7, 2021
eed589d
Fix createObject for postgres
cbaker6 Nov 23, 2021
f083c54
Try xit CloudCode test
cbaker6 Nov 23, 2021
bbbd0d4
revert test
cbaker6 Nov 23, 2021
72bb477
fix merge conflicts
cbaker6 Nov 23, 2021
0716014
revert 7593
cbaker6 Nov 24, 2021
2333d80
fix merge conflicts
cbaker6 Dec 23, 2022
9fb0a0f
revert
cbaker6 Dec 23, 2022
d5e3b4c
Update docker-publish.yml
cbaker6 Dec 23, 2022
b0205ca
Update docker-publish.yml
cbaker6 Dec 23, 2022
4806ed9
Update Dockerfile
cbaker6 Dec 23, 2022
bd89486
dont produce image with latest tag
cbaker6 Dec 24, 2022
aa0809e
remoove caching in docker
cbaker6 Dec 26, 2022
9aca9c6
nothing
cbaker6 Dec 26, 2022
667b97c
consolidate runs in Dockerfile
cbaker6 Dec 30, 2022
06d8cc2
Merge branch 'alpha' into docker
cbaker6 Jan 5, 2023
3aa442b
Merge branch 'parse-community:alpha' into docker
cbaker6 Jan 6, 2023
a490aae
Merge branch 'parse-community:alpha' into docker
cbaker6 Jan 9, 2023
84e76bd
Merge branch 'parse-community:alpha' into docker
cbaker6 Jan 16, 2023
1b97c38
Merge branch 'parse-community:alpha' into docker
cbaker6 Jan 23, 2023
a97d429
Merge branch 'parse-community:alpha' into docker
cbaker6 Jan 26, 2023
a5816cc
Merge branch 'parse-community:alpha' into docker
cbaker6 Sep 24, 2023
2b29d22
fix merge conflicts
cbaker6 Jan 21, 2024
3d291c2
Update Dockerfile
cbaker6 Jan 21, 2024
6217533
Update docker-publish.yml
cbaker6 Jan 21, 2024
127306f
Update docker-publish.yml
cbaker6 Jan 21, 2024
8851797
Update Dockerfile
cbaker6 Jan 21, 2024
cc049d2
fix merge conflicts
cbaker6 Feb 16, 2024
9ac9d3e
Merge branch 'alpha' into docker
cbaker6 Mar 3, 2024
278175b
Update docker-publish.yml
cbaker6 Mar 4, 2024
50ce4ef
Update docker-publish.yml
cbaker6 Mar 4, 2024
b9231bb
Update Dockerfile
cbaker6 Mar 4, 2024
c530407
Update docker-publish.yml
cbaker6 Mar 4, 2024
d3a32c0
Merge branch 'alpha' into docker
cbaker6 May 30, 2024
c9a3351
Merge branch 'alpha' into docker
cbaker6 May 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 59 additions & 0 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: docker

on:
push:
branches: [ docker ]
tags: [ '*.*.*' ]
pull_request:
branches: [ docker ]

env:
REGISTRY: docker.io
IMAGE_NAME: ${{ github.repository }}

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
build:

runs-on: ubuntu-latest
permissions:
contents: read
packages: write

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Set up QEMU
id: qemu
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Log into Docker Hub
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Extract Docker metadata
id: meta
uses: docker/metadata-action@v4
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
flavor: |
latest=false

- name: Build and push Docker image
uses: docker/build-push-action@v3
with:
context: .
platforms: linux/amd64, linux/arm64/v8
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file modified spec/GridFSBucketStorageAdapter.spec.js
100644 → 100755
Empty file.
Empty file modified spec/LdapAuth.spec.js
100644 → 100755
Empty file.
Empty file modified src/Adapters/Auth/google.js
100644 → 100755
Empty file.
Empty file modified src/Adapters/Auth/ldap.js
100644 → 100755
Empty file.
Empty file modified src/Adapters/Auth/vkontakte.js
100644 → 100755
Empty file.
Empty file modified src/Adapters/Files/GridFSBucketAdapter.js
100644 → 100755
Empty file.
Empty file modified src/Controllers/FilesController.js
100644 → 100755
Empty file.
Empty file modified src/GraphQL/loaders/defaultGraphQLTypes.js
100644 → 100755
Empty file.
Empty file modified src/GraphQL/loaders/functionsMutations.js
100644 → 100755
Empty file.
Empty file modified src/Options/Definitions.js
100644 → 100755
Empty file.
Loading