Skip to content

Commit ee64d17

Browse files
authored
use ubuntu-latest to build image (#254)
* use ubuntu-latest to build image * remove build args
1 parent 7d83785 commit ee64d17

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

.github/workflows/merge-trigger-tke.yaml

+11-10
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ on:
3131
jobs:
3232
docker_image_build:
3333
environment: ci
34-
runs-on: amd64-mo-shanghai-dind #amd64-mo-guangzhou-dind
34+
runs-on: ubuntu-latest #amd64-mo-shanghai-dind #amd64-mo-guangzhou-dind
3535
if: ${{ github.event.pull_request.merged == true }}
3636
timeout-minutes: 30
3737
name: BUILD MO DOCKER IMAGE
@@ -62,18 +62,19 @@ jobs:
6262
echo ${TAGS}
6363
echo ${{ secrets.TCR_TOKEN }} | docker login ccr.ccs.tencentyun.com -u ${{ secrets.TCR_USERNAME }} --password-stdin
6464
65-
# # add tencentyun docker image mirror and tencentyun apt mirror
66-
sed -i 's#^RUN apt-get update#RUN sed -i "s?http.*ubuntu\.com?http://mirrors\.ustc\.edu\.cn?g" /etc/apt/sources.list \&\& apt-get clean all \&\& apt-get update#g' optools/images/Dockerfile
67-
sed -i 's#FROM golang:1.21.5-bookworm#FROM ccr.ccs.tencentyun.com/cicd-runner/golang:1.21.5-bookworm#g' optools/images/Dockerfile
68-
sed -i 's#FROM ubuntu:22.04#FROM ccr.ccs.tencentyun.com/mo-infra/ubuntu:22.04#g' optools/images/Dockerfile
65+
# # # add tencentyun docker image mirror and tencentyun apt mirror
66+
# sed -i 's#^RUN apt-get update#RUN sed -i "s?http.*ubuntu\.com?http://mirrors\.ustc\.edu\.cn?g" /etc/apt/sources.list \&\& apt-get clean all \&\& apt-get update#g' optools/images/Dockerfile
67+
# sed -i 's#FROM golang:1.21.5-bookworm#FROM ccr.ccs.tencentyun.com/cicd-runner/golang:1.21.5-bookworm#g' optools/images/Dockerfile
68+
# sed -i 's#FROM ubuntu:22.04#FROM ccr.ccs.tencentyun.com/mo-infra/ubuntu:22.04#g' optools/images/Dockerfile
6969
70-
# adjust for go 1.22.3
71-
sed -i 's#FROM golang:1.22.3-bookworm#FROM ccr.ccs.tencentyun.com/mo-infra/golang:1.22.3-bookworm#g' optools/images/Dockerfile
70+
# # adjust for go 1.22.3
71+
# sed -i 's#FROM golang:1.22.3-bookworm#FROM ccr.ccs.tencentyun.com/mo-infra/golang:1.22.3-bookworm#g' optools/images/Dockerfile
7272
73-
# adjust for go 1.23.0
74-
sed -i 's#FROM golang:1.23.0-bookworm#FROM ccr.ccs.tencentyun.com/mo-infra/golang:1.23.0-bookworm#g' optools/images/Dockerfile
73+
# # adjust for go 1.23.0
74+
# sed -i 's#FROM golang:1.23.0-bookworm#FROM ccr.ccs.tencentyun.com/mo-infra/golang:1.23.0-bookworm#g' optools/images/Dockerfile
7575
76-
docker build -t $TAGS -f optools/images/Dockerfile . --build-arg GOPROXY='http://goproxy.goproxy.svc.cluster.local'
76+
# --build-arg GOPROXY='http://goproxy.goproxy.svc.cluster.local'
77+
docker build -t $TAGS -f optools/images/Dockerfile .
7778
docker push $TAGS
7879
setup_mo_test_env:
7980
if: ${{ always() && !cancelled() && needs.docker_image_build.result == 'success' }}

0 commit comments

Comments
 (0)