Skip to content

CHEF-33431: delegate platform-ui docker build to build-docker.sh #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vaibhavGadre wants to merge 9 commits into
base: main
Choose a base branch
from
+47 −5
Open

CHEF-33431: delegate platform-ui docker build to build-docker.sh #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1f5ca58
Add support for NPM Azure Key in Docker build for platform-ui
vaibhavGadre May 15, 2026
df77bd9
update common workflow for testing
vaibhavGadre May 15, 2026
0748f20
Add NPM Azure Key support for platform-ui Docker build and update wor…
vaibhavGadre May 15, 2026
5589931
CHEF-33431: delegate platform-ui docker build to build-docker.sh
vaibhavGadre May 25, 2026
126bd08
CHEF-33431: add platform-ui Strategy 0 to wiz.yml
vaibhavGadre May 26, 2026
f90199a
CHEF-33431: remove RUN_ID from build-docker-image.yml Strategy 0
vaibhavGadre May 26, 2026
76c4506
reverting testing changes
vaibhavGadre May 28, 2026
13a714b
CHEF-33431: detect platform-ui image dynamically after build-docker.sh
vaibhavGadre May 28, 2026
a06d1e1
testing changes
vaibhavGadre May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion .github/workflows/build-docker-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,22 @@ jobs:
echo "Building Docker image..."
REPO_NAME=$(basename $(pwd))

# Strategy 0: platform-ui — delegate entirely to build-docker.sh which handles
# submodule checkout (PAT), NPM Azure Key secret, and docker buildx build.
if [ "${{ github.event.repository.name }}" = "platform-ui" ]; then
echo "Detected platform-ui - delegating to build-docker.sh"
chmod +x build-docker.sh
GITHUB_TOKEN="${{ secrets.GH_TOKEN }}" \
NPM_AZURE_KEY="${{ secrets.NPM_AZURE_KEY }}" \
BRANCH_NAME="${{ github.head_ref || github.ref_name }}" \
GIT_SHA="${{ github.sha }}" \
APP_VERSION="${{ github.ref_name }}" \
LOCALES="en" \
./build-docker.sh
IMAGES=$(docker images --format "{{.Repository}}:{{.Tag}}" | grep -E "^${REPO_NAME}" | grep -v "^<none>")

# Strategy 1: Check for build-docker.sh script (e.g., dsm-erchef)
if [ -f "build-docker.sh" ]; then
elif [ -f "build-docker.sh" ]; then
echo "Found build-docker.sh script - using it to build images"
chmod +x build-docker.sh
GITHUB_TOKEN="${{ secrets.GH_TOKEN }}" ./build-docker.sh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-main-pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1016,7 +1016,7 @@ jobs:
run-grype-image:
name: 'Grype Docker image scan'
if: ${{ inputs.perform-grype-image-scan }}
uses: chef/common-github-actions/.github/workflows/grype.yml@main
uses: chef/common-github-actions/.github/workflows/grype.yml@vaibhav/CHEF-33431-platform-ui-docker-build-fix
needs: [checkout, build-docker-image]
secrets: inherit
with:
Expand All @@ -1029,7 +1029,7 @@ jobs:
build-docker-image:
name: 'Build Docker image for security scans'
if: ${{ inputs.perform-grype-image-scan == true || inputs.perform-wiz-scan == true }}
uses: chef/common-github-actions/.github/workflows/build-docker-image.yml@main
uses: chef/common-github-actions/.github/workflows/build-docker-image.yml@vaibhav/CHEF-33431-platform-ui-docker-build-fix
needs: checkout
secrets: inherit
with:
Expand Down
16 changes: 15 additions & 1 deletion .github/workflows/grype.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,22 @@ jobs:
echo "Building Docker image..."
REPO_NAME=$(basename $(pwd))

# Strategy 0: platform-ui — delegate entirely to build-docker.sh which handles
# submodule checkout (PAT), NPM Azure Key secret, and docker buildx build.
if [ "${{ github.event.repository.name }}" = "platform-ui" ]; then
echo "Detected platform-ui - delegating to build-docker.sh"
chmod +x build-docker.sh
GITHUB_TOKEN="${{ secrets.GH_TOKEN }}" \
NPM_AZURE_KEY="${{ secrets.NPM_AZURE_KEY }}" \
BRANCH_NAME="${{ github.head_ref || github.ref_name }}" \
GIT_SHA="${{ github.sha }}" \
APP_VERSION="${{ github.ref_name }}" \
LOCALES="en" \
./build-docker.sh
IMAGES=$(docker images --format "{{.Repository}}:{{.Tag}}" | grep -E "^${REPO_NAME}" | grep -v "^<none>")

# Strategy 1: Check for build-docker.sh script (e.g., dsm-erchef)
if [ -f "build-docker.sh" ]; then
elif [ -f "build-docker.sh" ]; then
echo "Found build-docker.sh script - using it to build images"
chmod +x build-docker.sh
GITHUB_TOKEN="${{ secrets.GH_TOKEN }}" ./build-docker.sh
Expand Down
16 changes: 15 additions & 1 deletion .github/workflows/wiz.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,22 @@ jobs:
echo "Building Docker image..."
REPO_NAME=$(basename $(pwd))

# Strategy 0: platform-ui — delegate entirely to build-docker.sh which handles
# submodule checkout (GITHUB_TOKEN), NPM Azure Key secret, and docker buildx build.
if [ "${{ github.event.repository.name }}" = "platform-ui" ]; then
echo "Detected platform-ui - delegating to build-docker.sh"
chmod +x build-docker.sh
GITHUB_TOKEN="${{ secrets.GH_TOKEN }}" \
NPM_AZURE_KEY="${{ secrets.NPM_AZURE_KEY }}" \
BRANCH_NAME="${{ github.head_ref || github.ref_name }}" \
GIT_SHA="${{ github.sha }}" \
APP_VERSION="${{ github.ref_name }}" \
LOCALES="en" \
./build-docker.sh
IMAGES=$(docker images --format "{{.Repository}}:{{.Tag}}" | grep -E "^${REPO_NAME}" | grep -v "^<none>")

# Strategy 1: Check for build-docker.sh script (e.g., dsm-erchef)
if [ -f "build-docker.sh" ]; then
elif [ -f "build-docker.sh" ]; then
echo "Found build-docker.sh script - using it to build images"
chmod +x build-docker.sh
GITHUB_TOKEN="${{ secrets.GH_TOKEN }}" ./build-docker.sh
Expand Down