Skip to content

Commit

Permalink
fix(ticdc): fix builder image (#540)
Browse files Browse the repository at this point in the history
- add gcc into rocky linux based builder image
- fix skaffold-centos7.yaml file

Signed-off-by: wuhuizuo <[email protected]>

---------

Signed-off-by: wuhuizuo <[email protected]>
  • Loading branch information
wuhuizuo authored Jan 23, 2025
1 parent 8664ce1 commit f83d845
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pull-cd-builder-images-centos7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
cat changed_files.txt
# Filter out deleted files and get only filenames and select the files in dockerfiles/cd/builders with `centos7` matched.
CHANGED_FILES=$(grep -v '^D' changed_files.txt | cut -f2- | grep -E '^dockerfiles/cd/builders/(.*Dockerfile|skaffold.*.yaml)' | grep centos7)
CHANGED_FILES=$(grep -v '^D' changed_files.txt | cut -f2- | grep -E '^dockerfiles/cd/builders/.*/(.*Dockerfile|skaffold.*.yaml)' | grep centos7)
CHANGED_FOLDERS=$(echo "$CHANGED_FILES" | xargs -n1 dirname | sort --unique)
# Convert the lists to JSON arrays
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-cd-builder-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
cat changed_files.txt
# Filter out deleted files and get only filenames and select the files in dockerfiles/cd/builders without `centos7` matched.
CHANGED_FILES=$(grep -v '^D' changed_files.txt | cut -f2- | grep -E '^dockerfiles/cd/builders/(.*Dockerfile|skaffold.*.yaml)' | grep -v centos7)
CHANGED_FILES=$(grep -v '^D' changed_files.txt | cut -f2- | grep -E '^dockerfiles/cd/builders/.*/(.*Dockerfile|skaffold.*.yaml)' | grep -v centos7)
CHANGED_FOLDERS=$(echo "$CHANGED_FILES" | xargs -n1 dirname | sort --unique)
# Convert the lists to JSON arrays
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-cd-builder-images-centos7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
cat changed_files.txt
# Filter out deleted files and get only filenames and select the files in dockerfiles/cd/builders with `centos7` matched.
CHANGED_FILES=$(grep -v '^D' changed_files.txt | cut -f2- | grep -E '^dockerfiles/cd/builders/(.*Dockerfile|skaffold.*.yaml)' | grep centos7)
CHANGED_FILES=$(grep -v '^D' changed_files.txt | cut -f2- | grep -E '^dockerfiles/cd/builders/.*/(.*Dockerfile|skaffold.*.yaml)' | grep centos7)
CHANGED_FOLDERS=$(echo "$CHANGED_FILES" | xargs -n1 dirname | sort --unique)
# Convert the lists to JSON arrays
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-cd-builder-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
cat changed_files.txt
# Filter out deleted files and get only filenames and select the files in dockerfiles/cd/builders without `centos7` matched.
CHANGED_FILES=$(grep -v '^D' changed_files.txt | cut -f2- | grep -E '^dockerfiles/cd/builders/(.*Dockerfile|skaffold.*.yaml)' | grep -v centos7)
CHANGED_FILES=$(grep -v '^D' changed_files.txt | cut -f2- | grep -E '^dockerfiles/cd/builders/.*/(.*Dockerfile|skaffold.*.yaml)' | grep -v centos7)
CHANGED_FOLDERS=$(echo "$CHANGED_FILES" | xargs -n1 dirname | sort --unique)
# Convert the lists to JSON arrays
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/cd/builders/ticdc/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ LABEL org.opencontainers.image.source "https://github.com/PingCAP-QE/artifacts"
# install packages.
RUN --mount=type=cache,target=/var/cache/dnf \
dnf upgrade-minimal -y && \
dnf install -y make git findutils
dnf install -y make git findutils gcc

# install golang toolchain
# renovate: datasource=docker depName=golang
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/cd/builders/ticdc/skaffold-centos7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ build:
- image: ticdc
platforms: [linux/amd64, linux/arm64]
docker:
dockerfile: Dockerfile
dockerfile: centos7/Dockerfile
target: builder
tagPolicy:
customTemplate:
Expand Down

0 comments on commit f83d845

Please sign in to comment.