Skip to content

Commit 580c8e1

Browse files
committed
fix(build) split DATABASE_BACKEND parameter
Upstream split the DATABASE_BACKEND parameter/var into SYNCSTORAGE_DATABASE_BACKEND and TOKENSERVER_DATABASE_BACKEND in mozilla-services/syncstorage-rs#1840
1 parent c0112b6 commit 580c8e1

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

.github/workflows/syncstorage-rs.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ env:
2424
SERVICE_CHANGELOG_PATH: CHANGELOG.md
2525
# specific for this component
2626
IMAGE_TAGS: mysql
27-
DATABASE_BACKEND: mysql
27+
SYNCSTORAGE_DATABASE_BACKEND: mysql
28+
TOKENSERVER_DATABASE_BACKEND: mysql
2829

2930
jobs:
3031

@@ -231,7 +232,8 @@ jobs:
231232
outputs: type=image,"name=${{ env.REPOSITORY_REGISTRY }}/${{ env.REPOSITORY_FULL_NAME }}",name-canonical=true,push=true
232233
context: ${{ steps.prepare-variables.outputs.code_dockerfile_path }}
233234
build-args: |
234-
DATABASE_BACKEND=${{ env.DATABASE_BACKEND }}
235+
SYNCSTORAGE_DATABASE_BACKEND=${{ env.SYNCSTORAGE_DATABASE_BACKEND }}
236+
TOKENSERVER_DATABASE_BACKEND=${{ env.TOKENSERVER_DATABASE_BACKEND }}
235237
cache-from: type=registry,ref=${{ env.REPOSITORY_REGISTRY }}/${{ env.REPOSITORY_FULL_NAME }}:buildcache-${{ env.SERVICE_NAME }}-${{ steps.image_name.outputs.docker_image_name_suffix }}-${{ needs.prepare-env.outputs.service_tag }}-${{ steps.prepare-platform-pair.outputs.platform_pair }}
236238
cache-to: type=registry,ref=${{ env.REPOSITORY_REGISTRY }}/${{ env.REPOSITORY_FULL_NAME }}:buildcache-${{ env.SERVICE_NAME }}-${{ steps.image_name.outputs.docker_image_name_suffix }}-${{ needs.prepare-env.outputs.service_tag }}-${{ steps.prepare-platform-pair.outputs.platform_pair }},mode=max
237239

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ All the images are updated weekly to the latest tag available from Mozilla's off
3333
- [ghcr.io/porelli/firefox-sync:syncstorage-rs-mysql-latest](https://github.com/porelli/firefox-sync/pkgs/container/firefox-sync/versions)
3434
- GitHub [workflow](/.github/workflows/syncstorage-rs.yml) and [logs](https://github.com/porelli/firefox-sync/actions/workflows/syncstorage-rs.yml)
3535
- Base image: [Mozilla's](https://github.com/mozilla-services/syncstorage-rs/blob/master/Dockerfile) container
36-
- Base image differences: image built with `DATABASE_BACKEND=mysql` to use the MySQL-compatible interface instead of Google Spanner
36+
- Base image differences: image built with `SYNCSTORAGE_DATABASE_BACKEND=mysql` and `TOKENSERVER_DATABASE_BACKEND=mysql` to use the MySQL-compatible interface instead of Google Spanner
3737
- source code: https://github.com/mozilla-services/syncstorage-rs
3838
- code changes: none
3939
- [ghcr.io/porelli/firefox-sync:syncstorage-rs-mysql-init-latest](https://github.com/porelli/firefox-sync/pkgs/container/firefox-sync/versions)

0 commit comments

Comments
 (0)