bitwarden/web
1
0
Fork 0
mirror of https://github.com/bitwarden/web synced 2025-12-12 14:23:18 +00:00
Code Issues Releases Wiki Activity

fixing docker image conflicts

Browse Source
This commit is contained in:
Joseph Flinn
2021-12-23 06:14:10 -08:00
committed by Joseph Flinn
parent ee28fdb88b
commit 71375c718a
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@@ -329,7 +329,7 @@ jobs:
- name: Get image tag - name: Get image tag
id: image-tag id: image-tag
run: | run: |
IMAGE_TAG=$(echo "$GITHUB_REF" | awk '{split($0, a, "/"); print a[3];}') IMAGE_TAG=$(echo "${GITHUB_REF:11}" | sed "s#/#-#g")
TAG_EXTENSION=${{ github.event.inputs.custom_tag_extension }} TAG_EXTENSION=${{ github.event.inputs.custom_tag_extension }}
if [[ $TAG_EXTENSION ]]; then if [[ $TAG_EXTENSION ]]; then

16
.github/workflows/qa-deploy.yml vendored
View File

@@ -9,8 +9,8 @@ on:
required: false required: false
env: env:
_QA_CLUSTER_RESOURCE_GROUP: "bitwarden-devops" _QA_CLUSTER_RESOURCE_GROUP: "bw-env-qa"
_QA_CLUSTER_NAME: "dev-aks" _QA_CLUSTER_NAME: "bw-aks-qa"
_QA_K8S_NAMESPACE: "bw-qa" _QA_K8S_NAMESPACE: "bw-qa"
_QA_K8S_APP_NAME: "bw-web" _QA_K8S_APP_NAME: "bw-web"
@@ -36,16 +36,16 @@ jobs:
uses: Azure/get-keyvault-secrets@80ccd3fafe5662407cc2e55f202ee34bfff8c403 uses: Azure/get-keyvault-secrets@80ccd3fafe5662407cc2e55f202ee34bfff8c403
with: with:
keyvault: "bitwarden-qa-kv" keyvault: "bitwarden-qa-kv"
secrets: "dev-aks-kubectl-credentials" secrets: "qa-aks-kubectl-credentials"
- name: Login to dev-aks-kubectl SP - name: Login with qa-aks-kubectl-credentials SP
uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
with: with:
creds: ${{ env.dev-aks-kubectl-credentials }} creds: ${{ env.qa-aks-kubectl-credentials }}
- name: Setup AKS access - name: Setup AKS access
env: #env:
USER_ID: ${{ env.qa-kubectl-managed-identity-clientId }} # USER_ID: ${{ env.qa-kubectl-managed-identity-clientId }}
run: | run: |
echo "---az install---" echo "---az install---"
az aks install-cli --install-location ./kubectl --kubelogin-install-location ./kubelogin az aks install-cli --install-location ./kubectl --kubelogin-install-location ./kubelogin
@@ -55,7 +55,7 @@ jobs:
- name: Get image tag - name: Get image tag
id: image_tag id: image_tag
run: | run: |
IMAGE_TAG=$(echo "$GITHUB_REF" | awk '{split($0, a, "/"); print a[3];}') IMAGE_TAG=$(echo "${GITHUB_REF:11}" | sed "s#/#-#g")
TAG_EXTENSION=${{ github.event.inputs.image_extension }} TAG_EXTENSION=${{ github.event.inputs.image_extension }}
if [[ $TAG_EXTENSION ]]; then if [[ $TAG_EXTENSION ]]; then