8000 Update from upstream repo by simonkagwi · Pull Request #3 · caktus/central · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Update from upstream repo #3

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

Merged
merged 43 commits into from
Jan 10, 2025
Merged

Update from upstream repo #3

merged 43 commits into from
Jan 10, 2025

Conversation

simonkagwi
Copy link

This merges in changes from the master branch on the upstream repo. There were some merge conflicts in files/service/scripts/start-odk.sh and files/nginx/setup-odk.sh

matthew-white and others added 30 commits May 8, 2024 01:18
Change purge-forms script to general purge
Resolves warnings:

    - FromAsCasing: 'as' and 'FROM' keywords' casing do not match
This script is no longer used anywhere.
These assertions are followed by more specific assertions on res.status, which provide more helpful error messages on failure.
Don't fail log output build steps if the corresponding docker image never started, e.g.

    Error response from daemon: No such container: test-enketo-1

This makes the github actions GUI less confusing and quicker to navigate to the real build failure.
pros:

* nginx tests actually run against a real image

cons:

* slows fresh/CI builds by about 1 minute
* this path isn't relevant to these tests, as they do not use letsencrypt SSL certs
* the tests don't make sense, as they're checking for 404s
* in the test scenario, specific handling for this path is removed from redirector.conf in files/nginx/setup-odk.sh
QR displayed in odk-central-frontend are displayed with src=data:...

Closes getodk#629
This significantly decreases test turnaround time.

Local results (`./run-tests; time ./run-tests.sh`):

* with this PR: 14 seconds
* without this: 90 seconds

Cons:

* complicates build script (`build-frontend.sh`)
brontolosone and others added 13 commits December 6, 2024 14:24
Nginx server config: JS was not compressed
Working on getodk#809 I noticed that the location of SSL certs is based either on the domain name, or on the method of supply of SSL certs.

Cert provision approach should probably not affect the nginx "server_name" setting.

Also, the old variable name `CNAME` (short for "certificate name?") is easily confused with the DNS concept of CNAME records ("canonical names").
* Use node 22.12.0 Docker images

* Upgrade Enketo

* Fix dependency vulnerabilities

* Use pyxform 3.0.0
This comment was merged as part of getodk#809, but was not correct by the time the PR was merged.
Copy link
Member
@tobiasmcnulty tobiasmcnulty left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for doing this! 📦

@simonkagwi simonkagwi merged commit fc4d182 into master Jan 10, 2025
0 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants
0