Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
DojoTestBackend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dojo Project (HES-SO)
Projects
Backend
DojoTestBackend
Commits
12431d23
Commit
12431d23
authored
1 year ago
by
michael.minelli
Browse files
Options
Downloads
Plain Diff
Merge branch 'dotenv-vault-migration' into API-v2.1.0
parents
9f1e4f7b
4dc3946d
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitignore
+4
-7
4 additions, 7 deletions
.gitignore
.gitlab-ci.yml
+15
-8
15 additions, 8 deletions
.gitlab-ci.yml
API
+1
-1
1 addition, 1 deletion
API
with
20 additions
and
16 deletions
.gitignore
+
4
−
7
View file @
12431d23
.env
secrets
secrets
aws.xml
aws.xml
...
@@ -186,11 +184,10 @@ web_modules/
...
@@ -186,11 +184,10 @@ web_modules/
.yarn-integrity
.yarn-integrity
# dotenv environment variable files
# dotenv environment variable files
.env
.env*
.env.development.local
.flaskenv*
.env.test.local
!.env.project
.env.production.local
!.env.vault
.env.local
# parcel-bundler cache (https://parceljs.org/)
# parcel-bundler cache (https://parceljs.org/)
.cache
.cache
...
...
This diff is collapsed.
Click to expand it.
.gitlab-ci.yml
+
15
−
8
View file @
12431d23
...
@@ -3,22 +3,29 @@ variables:
...
@@ -3,22 +3,29 @@ variables:
GIT_SUBMODULE_FORCE_HTTPS
:
"
true"
GIT_SUBMODULE_FORCE_HTTPS
:
"
true"
SECURE_FILES_DOWNLOAD_PATH
:
'
./'
SECURE_FILES_DOWNLOAD_PATH
:
'
./'
stages
:
stages
:
-
deploy
-
deploy
deploy
:
deploy
:
image
:
docker:latest
image
:
docker:latest
stage
:
deploy
stage
:
deploy
tags
:
tags
:
-
dojo_backend_deployment
-
dojo_backend_deployment
script
:
script
:
-
API_VERSION=$(jq -r .version API/ExpressAPI/package.json)
-
cd "API/ExpressAPI"
# Download secure files
-
curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash
# Get API version
# Prepare environment
-
API_VERSION=$(jq -r .version package.json)
-
mv env_$API_VERSION .env
-
cp .env API/.env
# Get env file
-
|
echo "Decrypt production env vars" # Do not remove this line because it is used for hide the production key from the ci/cd console
npx dotenv-vault local decrypt "${DOTENV_PROD_KEY}" > ../.env
# Deploy
# Deploy
-
cd ../../
-
./infra --run
-
./infra --run
only
:
rules
:
-
main
-
if
:
'
$CI_COMMIT_BRANCH
==
$CI_DEFAULT_BRANCH'
\ No newline at end of file
\ No newline at end of file
This diff is collapsed.
Click to expand it.
API
@
99efe8d7
Compare
7884e53c
...
99efe8d7
Subproject commit
7884e53cc8bdeb0575323467b34d7123af842eee
Subproject commit
99efe8d7a6f3efd394fd7a5aef61f77232ed39c5
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment