Skip to content

Commit 3fa7309

Browse files
authored
Strip unused docker image manipulation from cloudbuild (#3278)
Superflous after #3272 was merged
1 parent 00cc0b0 commit 3fa7309

File tree

3 files changed

+0
-67
lines changed

3 files changed

+0
-67
lines changed

cloudbuild_master.yaml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,6 @@ substitutions:
88
options:
99
machineType: E2_HIGHCPU_32
1010
steps:
11-
- id: pull_mysql
12-
name : gcr.io/cloud-builders/docker
13-
args:
14-
- pull
15-
- marketplace.gcr.io/google/mysql8:${_MYSQL_TAG}
16-
- id: tag_mysql
17-
name: gcr.io/cloud-builders/docker
18-
args:
19-
- tag
20-
- marketplace.gcr.io/google/mysql8:${_MYSQL_TAG}
21-
- gcr.io/${PROJECT_ID}/mysql8:${_MYSQL_TAG}
22-
waitFor:
23-
- pull_mysql
24-
- id: push_mysql
25-
name: gcr.io/cloud-builders/docker
26-
args:
27-
- push
28-
- gcr.io/${PROJECT_ID}/mysql8:${_MYSQL_TAG}
29-
waitFor:
30-
- tag_mysql
3111
- id: build_db_server
3212
name: gcr.io/kaniko-project/executor:v1.15.0
3313
args:
@@ -36,8 +16,6 @@ steps:
3616
- --destination=gcr.io/${PROJECT_ID}/db_server:latest
3717
- --cache=true
3818
- --cache-dir= # Cache is in Google Container Registry
39-
waitFor:
40-
- push_mysql
4119
- id: build_log_server
4220
name: gcr.io/kaniko-project/executor:v1.15.0
4321
args:

cloudbuild_pr.yaml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,36 +13,13 @@ options:
1313

1414
steps:
1515

16-
- id: pull_mysql
17-
name : gcr.io/cloud-builders/docker
18-
args:
19-
- pull
20-
- marketplace.gcr.io/google/mysql8:${_MYSQL_TAG}
21-
- id: tag_mysql
22-
name: gcr.io/cloud-builders/docker
23-
args:
24-
- tag
25-
- marketplace.gcr.io/google/mysql8:${_MYSQL_TAG}
26-
- gcr.io/${PROJECT_ID}/mysql8:${_MYSQL_TAG}
27-
waitFor:
28-
- pull_mysql
29-
- id: push_mysql
30-
name: gcr.io/cloud-builders/docker
31-
args:
32-
- push
33-
- gcr.io/${PROJECT_ID}/mysql8:${_MYSQL_TAG}
34-
waitFor:
35-
- tag_mysql
36-
3716
- id: build_db_server
3817
name: gcr.io/kaniko-project/executor:v1.15.0
3918
args:
4019
- --dockerfile=examples/deployment/docker/db_server/Dockerfile
4120
- --destination=gcr.io/${PROJECT_ID}/db_server:${COMMIT_SHA}
4221
- --cache=true
4322
- --cache-dir= # Cache is in Google Container Registry.
44-
waitFor:
45-
- push_mysql
4623

4724
- id: build_log_server
4825
name: gcr.io/kaniko-project/executor:v1.15.0

cloudbuild_tag.yaml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,13 @@ substitutions:
44
options:
55
machineType: E2_HIGHCPU_32
66
steps:
7-
- id: pull_mysql
8-
name : gcr.io/cloud-builders/docker
9-
args:
10-
- pull
11-
- marketplace.gcr.io/google/mysql8:${_MYSQL_TAG}
12-
- id: tag_mysql
13-
name: gcr.io/cloud-builders/docker
14-
args:
15-
- tag
16-
- marketplace.gcr.io/google/mysql8:${_MYSQL_TAG}
17-
- gcr.io/${PROJECT_ID}/mysql8:${_MYSQL_TAG}
18-
waitFor:
19-
- pull_mysql
20-
- id: push_mysql
21-
name: gcr.io/cloud-builders/docker
22-
args:
23-
- push
24-
- gcr.io/${PROJECT_ID}/mysql8:${_MYSQL_TAG}
25-
waitFor:
26-
- tag_mysql
277
- id: build_db_server
288
name: gcr.io/kaniko-project/executor:v1.15.0
299
args:
3010
- --dockerfile=examples/deployment/docker/db_server/Dockerfile
3111
- --destination=gcr.io/${PROJECT_ID}/db_server:${TAG_NAME}
3212
- --cache=true
3313
- --cache-dir= # Cache is in Google Container Registry
34-
waitFor:
35-
- push_mysql
3614
- id: build_log_server
3715
name: gcr.io/kaniko-project/executor:v1.15.0
3816
args:

0 commit comments

Comments
 (0)