-
Notifications
You must be signed in to change notification settings - Fork 160
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #872 from getodk/next
Patch Release 2024.3.1
- Loading branch information
Showing
5 changed files
with
79 additions
and
2 deletions.
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,9 @@ | ||
docker-compose-dev := docker compose --profile central -f docker-compose.yml -f docker-compose.dev.yml | ||
|
||
.PHONY: dev | ||
dev: | ||
$(docker-compose-dev) up -d | ||
|
||
.PHONY: stop | ||
stop: | ||
$(docker-compose-dev) stop |
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
Submodule client
updated
2 files
+4 −0 | src/components/dl-data.vue | |
+80 −0 | test/components/hover-card/entity.spec.js |
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,62 @@ | ||
# Assumption: This file will be merged by `docker compose` | ||
# | ||
# What it does: | ||
# Sets profiles for each service depending on whether that | ||
# service is required for Central development or not. | ||
# | ||
# depends_on of some services are reset using !reset custom yml tag | ||
# nb: can't replace depends_on so we have removed all the values, ok for dev | ||
services: | ||
postgres14: | ||
profiles: | ||
- central | ||
ports: | ||
- 5432:5432 | ||
postgres: | ||
profiles: | ||
- central | ||
image: debian:bullseye | ||
command: /bin/sh -c 'mkdir -p /var/lib/postgresql/14/data && touch /var/lib/postgresql/14/.postgres14-upgrade-successful' | ||
mail: | ||
profiles: | ||
- none | ||
service: | ||
profiles: | ||
- none | ||
nginx: | ||
profiles: | ||
- none | ||
pyxform: | ||
profiles: | ||
- central | ||
ports: | ||
- 5001:80 | ||
secrets: | ||
profiles: | ||
- central | ||
volumes: | ||
- dev_secrets:/etc/secrets | ||
working_dir: /etc/secrets | ||
command: /bin/sh -c 'echo "s0m3v3rys3cr3tk3y" > enketo-secret && echo "this $3cr3t key is crackable" > enketo-less-secret && echo "enketorules" > enketo-api-key' | ||
enketo: | ||
profiles: | ||
- central | ||
volumes: | ||
- dev_secrets:/etc/secrets | ||
depends_on: !override | ||
- secrets | ||
- enketo_redis_main | ||
environment: | ||
- ENV=DEV | ||
extra_hosts: | ||
- "${DOMAIN}:host-gateway" | ||
ports: | ||
- 8005:8005 | ||
enketo_redis_main: | ||
profiles: | ||
- central | ||
enketo_redis_cache: | ||
profiles: | ||
- central | ||
volumes: | ||
dev_secrets: |
Submodule server
updated
17 files
+51 −0 | .github/workflows/db-migrations.yml | |
+1 −0 | .mocharc.js | |
+6 −0 | Makefile | |
+10 −0 | config/db-migration-test.json | |
+3 −1 | lib/external/s3.js | |
+8 −0 | test/db-migrations/.eslintrc.js | |
+1 −0 | test/db-migrations/.gitignore | |
+46 −0 | test/db-migrations/20241008-01-add-user_preferences.spec.js | |
+108 −0 | test/db-migrations/migrator.js | |
+36 −0 | test/db-migrations/mocha-setup.js | |
+123 −0 | test/db-migrations/utils.js | |
+1 −0 | test/e2e/s3/test-forms/1-attachments/cities.geojson | |
+2 −0 | test/e2e/s3/test-forms/1-attachments/some.nomime | |
+8 −0 | test/e2e/s3/test-forms/1.xml | |
+6 −3 | test/e2e/s3/test.js | |
+16 −10 | test/e2e/util/api.js | |
+44 −0 | test/integration/api/submissions.js |