Skip to content

Commit 0b9ed5f

Browse files
committed
Fixed incorrectly prefixed environment variables.
1 parent 79bc146 commit 0b9ed5f

101 files changed

Lines changed: 611 additions & 611 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.ahoy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ commands:
123123
usage: Download database. Run with "--fresh" option to force fresh database backup.
124124
aliases: [fetch-db]
125125
cmd: |
126-
case " $* " in *" --fresh "*) export VORTEX_DB_DOWNLOAD_FRESH=1;; esac
126+
case " $* " in *" --fresh "*) export VORTEX_DOWNLOAD_DB_FRESH=1;; esac
127127
./scripts/vortex/download-db.sh
128128
#;> !PROVISION_TYPE_PROFILE
129129

.circleci/config.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ aliases:
3333
working_directory: &working_directory ~/project
3434
environment:
3535
#;< !PROVISION_TYPE_PROFILE
36-
VORTEX_DB_DOWNLOAD_SSH_FINGERPRINT: *db_ssh_fingerprint
36+
VORTEX_DOWNLOAD_DB_SSH_FINGERPRINT: *db_ssh_fingerprint
3737
#;> !PROVISION_TYPE_PROFILE
3838
VORTEX_DEPLOY_SSH_FINGERPRINT: *deploy_ssh_fingerprint
3939
docker:
@@ -161,7 +161,7 @@ jobs:
161161

162162
- run:
163163
name: Download DB
164-
command: VORTEX_DB_DOWNLOAD_SEMAPHORE=/tmp/download-db-success ./scripts/vortex/download-db.sh
164+
command: VORTEX_DOWNLOAD_DB_SEMAPHORE=/tmp/download-db-success ./scripts/vortex/download-db.sh
165165
no_output_timeout: 30m
166166

167167
# Execute commands after database download script finished: if the
@@ -195,7 +195,7 @@ jobs:
195195
database-nightly:
196196
<<: *job-database
197197
environment:
198-
VORTEX_DB_DOWNLOAD_SSH_FINGERPRINT: *db_ssh_fingerprint
198+
VORTEX_DOWNLOAD_DB_SSH_FINGERPRINT: *db_ssh_fingerprint
199199
VORTEX_DEPLOY_SSH_FINGERPRINT: *deploy_ssh_fingerprint
200200
# Enforce fresh DB build (do not rely on fallback caches).
201201
VORTEX_CI_DB_CACHE_FALLBACK: 'no'
@@ -616,8 +616,8 @@ jobs:
616616
vortex-dev-didi-database-fi:
617617
<<: *job-database
618618
environment:
619-
VORTEX_DB_DOWNLOAD_SOURCE: url
620-
VORTEX_DB_DOWNLOAD_FORCE: 1
619+
VORTEX_DOWNLOAD_DB_SOURCE: url
620+
VORTEX_DOWNLOAD_DB_FORCE: 1
621621
# Use container image database storage despite that the file is coming
622622
# from CURL - this is to make sure that image is exported into cache
623623
# to be used between jobs. Note that in consumer project .env file would
@@ -643,8 +643,8 @@ jobs:
643643
vortex-dev-database-ii:
644644
<<: *job-database
645645
environment:
646-
VORTEX_DB_DOWNLOAD_SOURCE: VORTEX_CONTAINER_REGISTRY
647-
VORTEX_DB_DOWNLOAD_FORCE: 1
646+
VORTEX_DOWNLOAD_DB_SOURCE: VORTEX_CONTAINER_REGISTRY
647+
VORTEX_DOWNLOAD_DB_FORCE: 1
648648
VORTEX_DB_IMAGE: drevops/vortex-dev-mariadb-drupal-data-demo-destination-11.x
649649
VORTEX_DEPLOY_CONTAINER_REGISTRY_IMAGE_TAG: vortex-dev-database-ii
650650
# Also, use this job to test pushing of the DB image to the container

.env

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ VORTEX_DB_FILE=db.sql
174174

175175
#;< !PROVISION_TYPE_PROFILE
176176
# Database download source.
177-
VORTEX_DB_DOWNLOAD_SOURCE=url
177+
VORTEX_DOWNLOAD_DB_SOURCE=url
178178

179179
#;< DB_DOWNLOAD_SOURCE_CONTAINER_REGISTRY
180180
# Name of the pre-built database container image.
@@ -186,42 +186,42 @@ VORTEX_DB_DOWNLOAD_SOURCE=url
186186
# Database dump file sourced from a URL.
187187
#
188188
# HTTP Basic Authentication credentials should be embedded into the value.
189-
VORTEX_DB_DOWNLOAD_URL=
189+
VORTEX_DOWNLOAD_DB_URL=
190190
#;> DB_DOWNLOAD_SOURCE_URL
191191

192192
#;< DB_DOWNLOAD_SOURCE_FTP
193193
# Database dump file sourced from FTP.
194194

195195
# Database dump FTP host.
196-
VORTEX_DB_DOWNLOAD_FTP_HOST=
196+
VORTEX_DOWNLOAD_DB_FTP_HOST=
197197

198198
# Database dump FTP port.
199-
VORTEX_DB_DOWNLOAD_FTP_PORT=21
199+
VORTEX_DOWNLOAD_DB_FTP_PORT=21
200200

201201
# Database dump FTP file name.
202-
VORTEX_DB_DOWNLOAD_FTP_FILE=db.sql
202+
VORTEX_DOWNLOAD_DB_FTP_FILE=db.sql
203203
#;> DB_DOWNLOAD_SOURCE_FTP
204204

205205
#;< DB_DOWNLOAD_SOURCE_S3
206206
# Database dump file sourced from S3.
207207

208208
# AWS S3 bucket name for database download.
209-
VORTEX_DB_DOWNLOAD_S3_BUCKET=
209+
VORTEX_DOWNLOAD_DB_S3_BUCKET=
210210

211211
# AWS S3 region.
212-
VORTEX_DB_DOWNLOAD_S3_REGION=ap-southeast-2
212+
VORTEX_DOWNLOAD_DB_S3_REGION=ap-southeast-2
213213
#;> DB_DOWNLOAD_SOURCE_S3
214214

215215
# Environment to download the database from.
216216
#
217217
# Applies to hosting environments.
218218
# Note that depending on the hosting provider, this variable may represent
219219
# a branch name or an environment name.
220-
VORTEX_DB_DOWNLOAD_ENVIRONMENT=prod
220+
VORTEX_DOWNLOAD_DB_ENVIRONMENT=prod
221221

222222
#;< HOSTING_ACQUIA
223223
# Acquia database name to download the database from.
224-
VORTEX_DB_DOWNLOAD_ACQUIA_DB_NAME=your_site
224+
VORTEX_DOWNLOAD_DB_ACQUIA_DB_NAME=your_site
225225
#;> HOSTING_ACQUIA
226226

227227
#;> !PROVISION_TYPE_PROFILE
@@ -300,7 +300,7 @@ VORTEX_NOTIFY_WEBHOOK_URL=
300300

301301
#;< DB_DOWNLOAD_SOURCE_URL
302302
# URL of the database used for demonstration with URL database download type.
303-
VORTEX_DB_DOWNLOAD_URL=https://github.com/drevops/vortex/releases/download/25.4.0/db_d11.demo.sql
303+
VORTEX_DOWNLOAD_DB_URL=https://github.com/drevops/vortex/releases/download/25.4.0/db_d11.demo.sql
304304
#;> DB_DOWNLOAD_SOURCE_URL
305305

306306
#;< DB_DOWNLOAD_SOURCE_CONTAINER_REGISTRY

.env.local.example

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ PACKAGE_TOKEN=
3232

3333
#;< !PROVISION_TYPE_PROFILE
3434
# Always override existing downloaded DB dump.
35-
VORTEX_DB_DOWNLOAD_FORCE=1
35+
VORTEX_DOWNLOAD_DB_FORCE=1
3636

3737
#;< DB_DOWNLOAD_SOURCE_FTP
3838
# Database dump file sourced from FTP.
3939

4040
# Database dump FTP user.
41-
VORTEX_DB_DOWNLOAD_FTP_USER=
41+
VORTEX_DOWNLOAD_DB_FTP_USER=
4242
# Database dump FTP password.
43-
VORTEX_DB_DOWNLOAD_FTP_PASS=
43+
VORTEX_DOWNLOAD_DB_FTP_PASS=
4444
#;> DB_DOWNLOAD_SOURCE_FTP
4545

4646
#;< DB_DOWNLOAD_SOURCE_ACQUIA
@@ -57,16 +57,16 @@ VORTEX_ACQUIA_SECRET=
5757
# Database dump file sourced from Lagoon.
5858

5959
# SSH file used to download the database dump from Lagoon. Defaults to "${HOME}/.ssh/id_rsa}".
60-
# VORTEX_DB_DOWNLOAD_SSH_FILE=
60+
# VORTEX_DOWNLOAD_DB_SSH_FILE=
6161
#;> DB_DOWNLOAD_SOURCE_LAGOON
6262

6363
#;< DB_DOWNLOAD_SOURCE_S3
6464
# Database dump file sourced from S3.
6565

6666
# AWS access key for S3 database download.
67-
VORTEX_DB_DOWNLOAD_S3_ACCESS_KEY=
67+
VORTEX_DOWNLOAD_DB_S3_ACCESS_KEY=
6868
# AWS secret key for S3 database download.
69-
VORTEX_DB_DOWNLOAD_S3_SECRET_KEY=
69+
VORTEX_DOWNLOAD_DB_S3_SECRET_KEY=
7070
#;> DB_DOWNLOAD_SOURCE_S3
7171

7272
#;< DB_DOWNLOAD_SOURCE_CONTAINER_REGISTRY

.github/workflows/build-test-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ jobs:
130130
131131
- name: Download DB
132132
run: |
133-
VORTEX_DB_DOWNLOAD_SEMAPHORE=/tmp/download-db-success ./scripts/vortex/download-db.sh
133+
VORTEX_DOWNLOAD_DB_SEMAPHORE=/tmp/download-db-success ./scripts/vortex/download-db.sh
134134
echo "db_hash=${{ hashFiles('.data') }}" >> "$GITHUB_ENV"
135135
timeout-minutes: 30
136136
#;< DB_DOWNLOAD_SOURCE_ACQUIA

.lagoon.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ tasks:
5353
command: |
5454
if [ "$LAGOON_ENVIRONMENT_TYPE" != "production" ] && [ "$LAGOON_GIT_BRANCH" != "${VORTEX_LAGOON_PRODUCTION_BRANCH:-main}" ]; then
5555
# No need to load SSH file to access production DB as Lagoon has SSH agent keys.
56-
export VORTEX_DB_DOWNLOAD_SSH_FILE=false
56+
export VORTEX_DOWNLOAD_DB_SSH_FILE=false
5757
export VORTEX_DB_DIR=/tmp/data
5858
rm -Rf $VORTEX_DB_DIR || true
5959
./scripts/vortex/download-db.sh

.vortex/docs/content/development/database.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ download the latest database dump into the `.data` directory.
2727
# Download latest database dump (uses cache if downloaded today)
2828
./scripts/vortex/download-db.sh
2929
# Force a fresh download regardless of cache
30-
VORTEX_DB_DOWNLOAD_FRESH=1 ./scripts/vortex/download-db.sh
30+
VORTEX_DOWNLOAD_DB_FRESH=1 ./scripts/vortex/download-db.sh
3131
```
3232
</TabItem>
3333
</Tabs>

0 commit comments

Comments
 (0)