@@ -174,24 +174,28 @@ jobs:
174174 run : |
175175 if [[ $WEB_REF =~ ^refs/tags/web-v(.+)$ ]]; then
176176 WEB_TAG="${BASH_REMATCH[1]}"
177+ WEB_IMAGE="ghcr.io/bitwarden/web"
177178 else
178179 WEB_TAG=$(echo "${WEB_REF#refs/heads/}" | \
179180 tr '[:upper:]' '[:lower:]' | \
180181 sed -E 's/[^a-z0-9._-]+/-/g; s/-+/-/g; s/^-+|-+$//g' | \
181182 cut -c1-128 | \
182183 sed -E 's/[.-]$//')
183184 [[ "$WEB_TAG" == "main" ]] && WEB_TAG=dev
185+ WEB_IMAGE="ghcr.io/bitwarden/web-dev"
184186 fi
185187 echo "web_tag=${WEB_TAG}" >> "$GITHUB_OUTPUT"
188+ echo "web_image=${WEB_IMAGE}" >> "$GITHUB_OUTPUT"
186189
187190 - name : Log build configuration
188191 env :
189192 SERVER_TAG : ${{ steps.tag.outputs.image_tag }}
193+ WEB_IMAGE : ${{ steps.web-tag.outputs.web_image }}
190194 WEB_TAG : ${{ steps.web-tag.outputs.web_tag }}
191195 run : |
192196 echo "### Build Configuration" >> $GITHUB_STEP_SUMMARY
193197 echo "- Server: ghcr.io/bitwarden/\*:${SERVER_TAG}" >> $GITHUB_STEP_SUMMARY
194- echo "- Web: ghcr.io/bitwarden/web :${WEB_TAG}" >> $GITHUB_STEP_SUMMARY
198+ echo "- Web: ${WEB_IMAGE} :${WEB_TAG}" >> $GITHUB_STEP_SUMMARY
195199
196200 - name : Build and push Docker image
197201 id : build-docker
@@ -207,6 +211,7 @@ jobs:
207211 tags : ghcr.io/bitwarden/lite:${{ steps.tag.outputs.image_tag }}
208212 build-args : |
209213 SERVER_TAG=${{ steps.tag.outputs.image_tag }}
214+ WEB_IMAGE=${{ steps.web-tag.outputs.web_image }}
210215 WEB_TAG=${{ steps.web-tag.outputs.web_tag }}
211216 cache-from : type=gha
212217 cache-to : type=gha,mode=min
0 commit comments