forked from tobinbradley/dirt-simple-postgis-http-api
-
Notifications
You must be signed in to change notification settings - Fork 0
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
Ona custom changes #2
Open
FrankApiyo
wants to merge
65
commits into
master
Choose a base branch
from
ona-custom-changes
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
65 commits
Select commit
Hold shift + click to select a range
9ac763c
Update /mvt query to work with configured TABLE_NAME and TABLE_COLUMN
FrankApiyo 0017195
[WIP]Add authentication middleware
FrankApiyo ba5053d
Add id to submission properties in mvt tile
FrankApiyo 094cbf7
Add submission json to mvt properties
FrankApiyo 93fab2c
Add authentication middleware
FrankApiyo 6585085
Ensure CORS is configured correctly using env and onadata intergratio…
FrankApiyo f266c0d
Add .env to .dockerignore
FrankApiyo 3947bb2
Add a healthcheck endpoint
FrankApiyo d4cc051
[WIP]Add filter for field_name and field_value
FrankApiyo a2868e9
Add dockerhub build and push github action
FrankApiyo 8ec0889
Add on push workflow trigger for ona-custom-changes
FrankApiyo 9ac5039
Build docker image when a tag is pushed
FrankApiyo db113da
Add push: true to build and push github action
FrankApiyo 0013eaf
Allow users who have no temp tokens to access public datasets
FrankApiyo 8bd36bb
Add ternary operator to check if CORS_ORIGIN is string and remove con…
FrankApiyo 91e4743
Update base image (node) version
FrankApiyo 5bbb949
Merge pull request #3 from onaio/update-base-image-version
FrankApiyo 0cac1e6
Merge branch 'master' into ona-custom-changes
KipSigei 4e5644b
Use comma separated list of origins
KipSigei 6d3247d
Update base image to use latest alpine
KipSigei e73472c
Merge pull request #4 from onaio/update-base-image
KipSigei d9529c0
Fix dependencies bug
KipSigei 888ae3f
Merge pull request #5 from onaio/fixes
KipSigei 17720f5
Fix dependencies bug
KipSigei 5970e40
Merge pull request #6 from onaio/fixes
KipSigei 8bd6b62
Cleanup
KipSigei c3d0955
Merge pull request #7 from onaio/fixes
KipSigei baa45a1
Fix imports
KipSigei c84c1b6
Use node 20.12.2 and update nodejs package-lock.json
ukanga 7826310
Upgrade alpine packages in Dockerfile
ukanga c7a2696
Optimize mvt query
FrankApiyo f14a777
Fix where clause error
FrankApiyo 72487d2
Merge pull request #9 from onaio/optimize-mvt-query
FrankApiyo d63a926
Merge pull request #8 from onaio/april-updates-2024
KipSigei ddfe73b
Optimive mvt query: Remove unneeded SRID and extra ST_Transform calls
FrankApiyo 56319fb
Merge pull request #10 from onaio/optimize-mvt-query
FrankApiyo f257308
Use node:20.13.1-alpine3.19
ukanga abafc0e
Merge pull request #12 from onaio/may-updates-2024
KipSigei 9f02a8f
Update base image to node:20.14.0-alpine3.19
KipSigei 3c0eb21
Update base image to node:20.15.0-alpine3.19
KipSigei 7ca685c
Merge pull request #13 from onaio/june-updates-2024
KipSigei c94086d
Update base image to node:20.15.1-alpine3.20
ciremusyoka 283e96b
Merge pull request #14 from onaio/update-base-image
ciremusyoka 62c8baf
Add endpoint to get map bounds and handle filters and errors
ciremusyoka ecd9ef9
Add limit subquery
ciremusyoka 9ddcea8
Fix schema type
ciremusyoka 1fe5086
Fix error when temp token not supplied and escape empty rows
ciremusyoka b7aac83
Merge pull request #15 from onaio/get-map-bounds
ciremusyoka e121b96
Update axios to v1.7.5
ciremusyoka 4c6788f
Merge pull request #16 from onaio/update-axios
ciremusyoka 967f090
Remove fastify express.
ciremusyoka e5e39f5
Use node v20.17.0
ciremusyoka e164c74
Merge pull request #17 from onaio/remove-express-upgrade-node
ciremusyoka 0ba5cba
Update find-my-way 8.0.0 -> 8.2.2
FrankApiyo 7a1021d
Merge pull request #18 from onaio/update-find-my-way
FrankApiyo 0bf11b9
Update base image node:20.17 -> node:20.18
FrankApiyo 08f0c50
Update the cookie and find-my-way npm packages
FrankApiyo 2b5cb0c
Merge pull request #19 from onaio/oct-30-2024-sec-updates
FrankApiyo b9d74cd
Update package-spawn dependency
FrankApiyo 6e1fda3
Update cross-spawn
FrankApiyo 1cdfd30
Merge pull request #20 from onaio/update-cross-spawn
FrankApiyo d852acc
Update package-lock file
FrankApiyo d4aac19
Merge pull request #21 from onaio/update-package-lock-file
FrankApiyo fbe2029
Change CORS_ORIGIN -> CORS_ORIGINS
FrankApiyo e53568a
Merge pull request #22 from onaio/fix-cors-origins-bug
FrankApiyo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
name: build and push image to dockerhub | ||
on: | ||
push: | ||
tags: | ||
- '[0-9]+\.[0-9]+\.[0-9]+' | ||
jobs: | ||
main: | ||
runs-on: ubuntu-22.04 | ||
steps: | ||
- name: Get the version | ||
id: get-version-release | ||
run: echo "version=${GITHUB_REF_NAME#refs/heads}" >> $GITHUB_ENV | ||
|
||
- name: Checkout to version | ||
uses: actions/checkout@v3 | ||
with: | ||
ref: ${{ env.version }} | ||
|
||
- name: Login to DockerHub | ||
uses: docker/login-action@v2 | ||
with: | ||
username: ${{ secrets.DOCKER_HUB_USERNAME }} | ||
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | ||
|
||
- name: Build and push | ||
id: docker-build | ||
uses: docker/build-push-action@v3 | ||
with: | ||
context: . | ||
file: Dockerfile | ||
platforms: linux/amd64 | ||
push: true | ||
tags: | | ||
onaio/dirt-tile-server:${{ env.version }} | ||
|
||
- name: Image digest | ||
run: echo ${{ steps.docker-build.outputs.digest }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,10 @@ | ||
# adapted from https://nodejs.org/en/docs/guides/nodejs-docker-webapp/ | ||
FROM node:20-slim | ||
FROM node:20.18.0-alpine3.20 | ||
RUN apk update && apk upgrade | ||
WORKDIR /usr/src/app | ||
COPY package*.json ./ | ||
RUN npm ci --only=production | ||
COPY . . | ||
RUN npm install | ||
EXPOSE 3000 | ||
CMD [ "npm", "run", "start" ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we maybe add the error to logs
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If t this error occurs, most likely we didn't import fastify successfully and so the logger has not been initialized