Merge pull request #1760 from shiftstack/dockerfile

🌱 Remove Containerfile and Dockerfile experimental

Author: k8s-ci-robot

Containerfile

@@ -1,6 +1,4 @@
-# syntax=docker/dockerfile:1.1-experimental
-
-# Copyright 2019 The Kubernetes Authors.
+# Copyright 2023 The Kubernetes Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Dockerfile

@@ -60,15 +60,6 @@ export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT ?= 60s
 
 PATH := $(abspath $(TOOLS_BIN_DIR)):$(PATH)
 export PATH
-export DOCKER_CLI_EXPERIMENTAL=enabled
-export DOCKER_BUILDKIT=1
-
-PODMAN ?= 0
-ifeq ($(PODMAN), 1)
-	CONTAINERFILE ?= Containerfile
-else
-	CONTAINERFILE ?= Dockerfile
-endif
 
 # Release variables
 
@@ -289,19 +280,13 @@ generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
 ## --------------------------------------
 
 .PHONY: docker-build
-docker-build: docker-pull-prerequisites ## Build the docker image for controller-manager
-	docker build -f $(CONTAINERFILE) --build-arg goproxy=$(GOPROXY) --build-arg ARCH=$(ARCH) --build-arg LDFLAGS="$(LDFLAGS)" . -t $(CONTROLLER_IMG_TAG)
+docker-build: ## Build the docker image for controller-manager
+	docker build -f Dockerfile --build-arg goproxy=$(GOPROXY) --build-arg ARCH=$(ARCH) --build-arg LDFLAGS="$(LDFLAGS)" . -t $(CONTROLLER_IMG_TAG)
 
 .PHONY: docker-push
 docker-push: ## Push the docker image
 	docker push $(CONTROLLER_IMG_TAG)
 
-.PHONY: docker-pull-prerequisites
-docker-pull-prerequisites:
-	[ "$(PODMAN)" -eq 0 ] && docker pull docker.io/docker/dockerfile:1.1-experimental
-	docker pull docker.io/library/golang:$(GOLANG_VERSION)
-	docker pull gcr.io/distroless/static:latest
-
 ## --------------------------------------
 ##@ Docker — All ARCH
 ## --------------------------------------

Makefile

@@ -1,5 +1,3 @@
-# syntax=docker/dockerfile:1.1-experimental
-
 # Copyright YEAR The Kubernetes Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

hack/boilerplate/boilerplate.Dockerfile.txt

@@ -13,6 +13,5 @@
 # limitations under the License.
 
 MDBOOK_VERSION := v0.4.5
-GOLANG_VERSION := 1.20.10
 PLANTUML_VERSION := 1.2022.6
 GH_VERSION := 1.2.0