Merged PR 529: Pipelineの仕組みを修正する

## 概要
[Task2949: Pipelineの仕組みを修正する](https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/fa4924a4-d079-4fab-9fb5-a9a11eb205f0/_workitems/edit/2949)

- .env.(環境名) の環境変数を用いてフロント側ビルドを行うよう修正
- ビルドパイプラインでstaging/production用の両方のフロント側ビルドを行うよう変更

## レビューポイント
- 仕組み上の不明点はないか
- 情報共有

## 動作確認状況
- 本番環境へデプロイされ、本当の最低限だけ動作することを確認
This commit is contained in:
湯本 開 2023-10-26 04:37:58 +00:00
parent 8ace80de74
commit 8474c6a4f5
3 changed files with 59 additions and 9 deletions

View File

@ -49,7 +49,7 @@ jobs:
displayName: Deploy Frontend Files displayName: Deploy Frontend Files
variables: variables:
storageAccountName: saomdspipeline storageAccountName: saomdspipeline
containerName: staging environment: production
pool: pool:
vmImage: ubuntu-latest vmImage: ubuntu-latest
steps: steps:
@ -65,7 +65,7 @@ jobs:
az storage blob download \ az storage blob download \
--auth-mode login \ --auth-mode login \
--account-name $(storageAccountName) \ --account-name $(storageAccountName) \
--container-name $(containerName) \ --container-name $(environment) \
--name $(Build.SourceVersion).zip \ --name $(Build.SourceVersion).zip \
--file $(Build.SourcesDirectory)/$(Build.SourceVersion).zip --file $(Build.SourcesDirectory)/$(Build.SourceVersion).zip
- task: Bash@3 - task: Bash@3

View File

@ -99,13 +99,13 @@ jobs:
azureContainerRegistry: '{"loginServer":"crodmsregistrymaintenance.azurecr.io", "id" : "/subscriptions/108fb131-cdca-4729-a2be-e5bd8c0b3ba7/resourceGroups/maintenance-rg/providers/Microsoft.ContainerRegistry/registries/crOdmsRegistryMaintenance"}' azureContainerRegistry: '{"loginServer":"crodmsregistrymaintenance.azurecr.io", "id" : "/subscriptions/108fb131-cdca-4729-a2be-e5bd8c0b3ba7/resourceGroups/maintenance-rg/providers/Microsoft.ContainerRegistry/registries/crOdmsRegistryMaintenance"}'
action: Push an image action: Push an image
imageName: odmscloud/staging/dictation:$(Build.SourceVersion) imageName: odmscloud/staging/dictation:$(Build.SourceVersion)
- job: frontend_build - job: frontend_build_staging
dependsOn: backend_build dependsOn: backend_build
condition: succeeded('backend_build') condition: succeeded('backend_build')
displayName: Build Frontend Files displayName: Build Frontend Files(staging)
variables: variables:
storageAccountName: saomdspipeline storageAccountName: saomdspipeline
containerName: staging environment: staging
pool: pool:
name: odms-deploy-pipeline name: odms-deploy-pipeline
steps: steps:
@ -122,7 +122,7 @@ jobs:
displayName: Bash Script displayName: Bash Script
inputs: inputs:
targetType: inline targetType: inline
script: cd dictation_client && npm run build script: cd dictation_client && cp -f .env.$(environment) .env && npm run build
- task: ArchiveFiles@2 - task: ArchiveFiles@2
inputs: inputs:
rootFolderOrFile: dictation_client/build rootFolderOrFile: dictation_client/build
@ -139,14 +139,59 @@ jobs:
az storage blob upload \ az storage blob upload \
--auth-mode login \ --auth-mode login \
--account-name $(storageAccountName) \ --account-name $(storageAccountName) \
--container-name $(containerName) \ --container-name $(environment) \
--name $(Build.SourceVersion).zip \
--type block \
--overwrite \
--file $(Build.ArtifactStagingDirectory)/$(Build.SourceVersion).zip
- job: frontend_build_production
dependsOn: frontend_build_staging
condition: succeeded('frontend_build_staging')
displayName: Build Frontend Files(production)
variables:
storageAccountName: saomdspipeline
environment: production
pool:
name: odms-deploy-pipeline
steps:
- checkout: self
clean: true
fetchDepth: 1
- task: Npm@1
displayName: npm ci
inputs:
command: ci
workingDir: dictation_client
verbose: false
- task: Bash@3
displayName: Bash Script
inputs:
targetType: inline
script: cd dictation_client && cp -f .env.$(environment) .env && npm run build
- task: ArchiveFiles@2
inputs:
rootFolderOrFile: dictation_client/build
includeRootFolder: false
archiveType: 'zip'
archiveFile: '$(Build.ArtifactStagingDirectory)/$(Build.SourceVersion).zip'
replaceExistingArchive: true
- task: AzureCLI@2
inputs:
azureSubscription: 'omds-service-connection-stg'
scriptType: 'bash'
scriptLocation: 'inlineScript'
inlineScript: |
az storage blob upload \
--auth-mode login \
--account-name $(storageAccountName) \
--container-name $(environment) \
--name $(Build.SourceVersion).zip \ --name $(Build.SourceVersion).zip \
--type block \ --type block \
--overwrite \ --overwrite \
--file $(Build.ArtifactStagingDirectory)/$(Build.SourceVersion).zip --file $(Build.ArtifactStagingDirectory)/$(Build.SourceVersion).zip
- job: backend_deploy - job: backend_deploy
dependsOn: frontend_build dependsOn: frontend_build_production
condition: succeeded('frontend_build') condition: succeeded('frontend_build_production')
displayName: Backend Deploy displayName: Backend Deploy
pool: pool:
name: odms-deploy-pipeline name: odms-deploy-pipeline

View File

@ -0,0 +1,5 @@
VITE_STAGE=production
VITE_B2C_CLIENTID=b0ec473b-6b2b-4f12-adc6-39a24ebe6a3f
VITE_B2C_AUTHORITY=https://adb2codmsprod.b2clogin.com/adb2codmsprod.onmicrosoft.com/b2c_1_signin_prod
VITE_B2C_KNOWNAUTHORITIES=adb2codmsprod.b2clogin.com
VITE_DESK_TOP_APP_SCHEME=odms-desktopapp