-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: Update to debian bookworm / Python 3.12 (#1567)
* chore: Update to debian bookworm / Python 3.12
- Loading branch information
Showing
8 changed files
with
108 additions
and
86 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
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
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
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
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
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,69 +1,69 @@ | ||
| version: '3' | ||
| version: "3" | ||
| services: | ||
| sync-db: | ||
| # Getting sporadic errors in spanner. | ||
| # These errors are "INTERNAL: ZETASQL_RET_CHECK failure" | ||
| # in the `backend/query/query_engine.cc` file for spanner. | ||
| # These result in a 500 error, which causes the test to fail. | ||
| # I believe come from the SQL parser, but am not sure. I am | ||
| # unable to produce these errors locally, and am using the cited | ||
| # version. | ||
| image: gcr.io/cloud-spanner-emulator/emulator:1.5.13 | ||
| ports: | ||
| - "9010:9010" | ||
| - "9020:9020" | ||
| environment: | ||
| PATH: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin | ||
| sync-db-setup: | ||
| image: app:build | ||
| depends_on: | ||
| - sync-db | ||
| restart: "no" | ||
| entrypoint: "/app/scripts/prepare-spanner.sh" | ||
| environment: | ||
| SYNC_SYNCSTORAGE__SPANNER_EMULATOR_HOST: sync-db:9020 | ||
| tokenserver-db: | ||
| image: docker.io/library/mysql:5.7 | ||
| volumes: | ||
| - tokenserver_db_data:/var/lib/mysql | ||
| restart: always | ||
| ports: | ||
| - "3306" | ||
| environment: | ||
| #MYSQL_RANDOM_ROOT_PASSWORD: yes | ||
| MYSQL_ROOT_PASSWORD: random | ||
| MYSQL_DATABASE: tokenserver | ||
| MYSQL_USER: test | ||
| MYSQL_PASSWORD: test | ||
| mock-fxa-server: | ||
| image: app:build | ||
| restart: "no" | ||
| entrypoint: "python3 /app/tools/integration_tests/tokenserver/mock_fxa_server.py" | ||
| environment: | ||
| MOCK_FXA_SERVER_HOST: 0.0.0.0 | ||
| MOCK_FXA_SERVER_PORT: 6000 | ||
| syncserver: | ||
| # NOTE: The naming in the rest of this repository has been updated to reflect the fact | ||
| # that Syncstorage and Tokenserver are now part of one repository/server called | ||
| # "Syncserver" (updated from "syncstorage-rs"). We keep the legacy naming below for | ||
| # backwards compatibility with previous Docker images. | ||
| image: ${SYNCSTORAGE_RS_IMAGE:-syncstorage-rs:latest} | ||
| restart: always | ||
| ports: | ||
| - "8000:8000" | ||
| depends_on: | ||
| - sync-db-setup | ||
| environment: | ||
| SYNC_HOST: 0.0.0.0 | ||
| SYNC_MASTER_SECRET: secret0 | ||
| SYNC_SYNCSTORAGE__DATABASE_URL: spanner://projects/test-project/instances/test-instance/databases/test-database | ||
| SYNC_SYNCSTORAGE__SPANNER_EMULATOR_HOST: sync-db:9010 | ||
| SYNC_TOKENSERVER__DATABASE_URL: mysql://test:test@tokenserver-db:3306/tokenserver | ||
| SYNC_TOKENSERVER__RUN_MIGRATIONS: "true" | ||
| sync-db: | ||
| # Getting sporadic errors in spanner. | ||
| # These errors are "INTERNAL: ZETASQL_RET_CHECK failure" | ||
| # in the `backend/query/query_engine.cc` file for spanner. | ||
| # These result in a 500 error, which causes the test to fail. | ||
| # I believe come from the SQL parser, but am not sure. I am | ||
| # unable to produce these errors locally, and am using the cited | ||
| # version. | ||
| image: gcr.io/cloud-spanner-emulator/emulator:1.5.13 | ||
| ports: | ||
| - "9010:9010" | ||
| - "9020:9020" | ||
| environment: | ||
| PATH: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin | ||
| sync-db-setup: | ||
| image: app:build | ||
| depends_on: | ||
| - sync-db | ||
| restart: "no" | ||
| entrypoint: "/app/scripts/prepare-spanner.sh" | ||
| environment: | ||
| SYNC_SYNCSTORAGE__SPANNER_EMULATOR_HOST: sync-db:9020 | ||
| tokenserver-db: | ||
| image: docker.io/library/mysql:5.7 | ||
| volumes: | ||
| - tokenserver_db_data:/var/lib/mysql | ||
| restart: always | ||
| ports: | ||
| - "3306" | ||
| environment: | ||
| #MYSQL_RANDOM_ROOT_PASSWORD: yes | ||
| MYSQL_ROOT_PASSWORD: random | ||
| MYSQL_DATABASE: tokenserver | ||
| MYSQL_USER: test | ||
| MYSQL_PASSWORD: test | ||
| mock-fxa-server: | ||
| image: app:build | ||
| restart: "no" | ||
| entrypoint: "sh /app/scripts/start_mock_fxa_server.sh" | ||
| environment: | ||
| MOCK_FXA_SERVER_HOST: 0.0.0.0 | ||
| MOCK_FXA_SERVER_PORT: 6000 | ||
| syncserver: | ||
| # NOTE: The naming in the rest of this repository has been updated to reflect the fact | ||
| # that Syncstorage and Tokenserver are now part of one repository/server called | ||
| # "Syncserver" (updated from "syncstorage-rs"). We keep the legacy naming below for | ||
| # backwards compatibility with previous Docker images. | ||
| image: ${SYNCSTORAGE_RS_IMAGE:-syncstorage-rs:latest} | ||
| restart: always | ||
| ports: | ||
| - "8000:8000" | ||
| depends_on: | ||
| - sync-db-setup | ||
| environment: | ||
| SYNC_HOST: 0.0.0.0 | ||
| SYNC_MASTER_SECRET: secret0 | ||
| SYNC_SYNCSTORAGE__DATABASE_URL: spanner://projects/test-project/instances/test-instance/databases/test-database | ||
| SYNC_SYNCSTORAGE__SPANNER_EMULATOR_HOST: sync-db:9010 | ||
| SYNC_TOKENSERVER__DATABASE_URL: mysql://test:test@tokenserver-db:3306/tokenserver | ||
| SYNC_TOKENSERVER__RUN_MIGRATIONS: "true" | ||
|
|
||
| volumes: | ||
| tokenserver_db_data: | ||
| tokenserver_db_data: | ||
|
|
||
| # Application runs off of port 8000. | ||
| # you can test if it's available with | ||
| # curl "http://localhost:8000/__heartbeat__" | ||
| # Application runs off of port 8000. | ||
| # you can test if it's available with | ||
| # curl "http://localhost:8000/__heartbeat__" |
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,5 @@ | ||
| #!/bin/sh | ||
|
|
||
| . /app/venv/bin/activate | ||
| python3 /app/tools/integration_tests/tokenserver/mock_fxa_server.py | ||
|
|
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