From 206030abbbd8d1e5dc6ee5c41e3ed6cd98aa7262 Mon Sep 17 00:00:00 2001 From: twwy Date: Fri, 16 Jun 2023 17:49:44 +0800 Subject: [PATCH] fix: build.sh remove no-cache --- build.sh | 8 ++++---- .../sreworks-chart/charts/appmanager/templates/rbac.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index 98761f3e..cafee3ac 100755 --- a/build.sh +++ b/build.sh @@ -82,7 +82,7 @@ target_migrate(){ echo "-- build sw-migrate --" >&2 TMP_DOCKERFILE="/tmp/${RANDOM}.dockerfile" envsubst < $SW_ROOT/paas/migrate/Dockerfile.tpl > ${TMP_DOCKERFILE} - docker build -t sw-migrate:$tag --pull --no-cache -f ${TMP_DOCKERFILE} $SW_ROOT/paas/migrate + docker build -t sw-migrate:$tag -f ${TMP_DOCKERFILE} $SW_ROOT/paas/migrate docker tag sw-migrate:$tag sw-migrate:latest fi if [ -n "$PUSH_REPO" ]; then @@ -98,7 +98,7 @@ target_progress_check(){ echo "-- build sw-progress-check --" >&2 TMP_DOCKERFILE="/tmp/${RANDOM}.dockerfile" envsubst < $SW_ROOT/paas/progress-check/Dockerfile.tpl > ${TMP_DOCKERFILE} - docker build -t sw-progress-check:$tag --pull --no-cache -f ${TMP_DOCKERFILE} $SW_ROOT/paas/progress-check + docker build -t sw-progress-check:$tag -f ${TMP_DOCKERFILE} $SW_ROOT/paas/progress-check docker tag sw-progress-check:$tag sw-progress-check:latest fi if [ -n "$PUSH_REPO" ]; then @@ -112,7 +112,7 @@ target_openjdk8(){ [ -n "$TAG" ] && tag=$TAG || tag="latest" if [ -n "$BUILD" ]; then echo "-- build sw-openjdk8-jre --" >&2 - docker build -t sw-openjdk8-jre:$tag --pull --no-cache -f $SW_ROOT/paas/openjdk8-jre/Dockerfile $SW_ROOT/paas/openjdk8-jre + docker build -t sw-openjdk8-jre:$tag -f $SW_ROOT/paas/openjdk8-jre/Dockerfile $SW_ROOT/paas/openjdk8-jre docker tag sw-openjdk8-jre:$tag sw-openjdk8-jre:latest fi if [ -n "$PUSH_REPO" ]; then @@ -128,7 +128,7 @@ target_postrun(){ echo "-- build sw-postrun --" >&2 TMP_DOCKERFILE="/tmp/${RANDOM}.dockerfile" envsubst < $SW_ROOT/paas/postrun/Dockerfile.tpl > ${TMP_DOCKERFILE} - docker build -t sw-postrun:$tag --pull --no-cache -f ${TMP_DOCKERFILE} $SW_ROOT/paas/postrun + docker build -t sw-postrun:$tag -f ${TMP_DOCKERFILE} $SW_ROOT/paas/postrun docker tag sw-postrun:$tag sw-postrun:latest fi if [ -n "$PUSH_REPO" ]; then diff --git a/chart/sreworks-chart/charts/appmanager/templates/rbac.yaml b/chart/sreworks-chart/charts/appmanager/templates/rbac.yaml index b2449991..cd285dd2 100644 --- a/chart/sreworks-chart/charts/appmanager/templates/rbac.yaml +++ b/chart/sreworks-chart/charts/appmanager/templates/rbac.yaml @@ -331,4 +331,4 @@ subjects: - kind: ServiceAccount name: default namespace: {{ .Release.Namespace }} -{{ end }} +{{ end }} \ No newline at end of file