@@ -110,7 +110,7 @@ class Config(DockerBundler.Config):
110110 # Build image asynchronously.
111111 colocated_image_required : bool = False
112112 colocated_image_name : str = None
113- colocated_dockerfile : str = None
113+ # colocated_dockerfile: str = None
114114
115115
116116 @classmethod
@@ -120,7 +120,7 @@ def from_spec(cls, spec: list[str], *, fv: Optional[flags.FlagValues]) -> Docker
120120 cfg .dockerfile = cfg .dockerfile or gcp_settings ("default_dockerfile" , required = False , fv = fv )
121121 cfg .colocated_image_required = cfg .colocated_image_required or gcp_settings ("colocated_image_required" , required = False , fv = fv )
122122 cfg .colocated_image_name = cfg .colocated_image_name or gcp_settings ("colocated_image_name" , required = False , fv = fv )
123- cfg .colocated_dockerfile = cfg .colocated_dockerfile or gcp_settings ("colocated_dockerfile" , required = False , fv = fv )
123+ # cfg.colocated_dockerfile = cfg.colocated_dockerfile or gcp_settings("colocated_dockerfile", required=False, fv=fv)
124124 return cfg
125125
126126 def _build_and_push (self , * args , ** kwargs ):
@@ -131,18 +131,18 @@ def _build_and_push(self, *args, **kwargs):
131131 )
132132
133133 actual_name = cfg .image
134- actual_dockerfile = cfg .dockerfile
134+ # actual_dockerfile=cfg.dockerfile
135135 actual_target = cfg .target
136136 if bool (cfg .colocated_image_required ):
137137
138- cfg .dockerfile = cfg .colocated_dockerfile
138+ # cfg.dockerfile=cfg.colocated_dockerfile
139139 cfg .image = cfg .colocated_image_name
140- cfg .target = None
140+ cfg .target = "colocated-python"
141141
142142 colocated_bundler_class = ColocatedArtifactRegistryBundler (cfg = cfg )
143143 colocated_image_name = colocated_bundler_class .bundle (tag = cfg .image )
144144
145- cfg .dockerfile = actual_dockerfile
145+ # cfg.dockerfile=actual_dockerfile
146146 cfg .image = actual_name
147147 cfg .target = actual_target
148148
@@ -156,7 +156,7 @@ class ColocatedArtifactRegistryBundler(DockerBundler):
156156 def from_spec (cls , spec : list [str ], * , fv : Optional [flags .FlagValues ]) -> DockerBundler .Config :
157157 cfg : ColocatedArtifactRegistryBundler .Config = super ().from_spec (spec , fv = fv )
158158 cfg .repo = cfg .repo or gcp_settings ("docker_repo" , required = False , fv = fv )
159- cfg .dockerfile = cfg .colocated_dockerfile or gcp_settings ("colocated_dockerfile " , required = False , fv = fv )
159+ cfg .dockerfile = cfg .colocated_dockerfile or gcp_settings ("default_dockerfile " , required = False , fv = fv )
160160 return cfg
161161
162162 def _build_and_push (self , * args , ** kwargs ):
0 commit comments