Skip to content

Commit

Permalink
Merge pull request #1039 from Daimler/tobiasgiese/fix-push-images-job
Browse files Browse the repository at this point in the history
🐛 Fix image push in Makefile for image-push jobs
  • Loading branch information
k8s-ci-robot authored Nov 5, 2021
2 parents 8fcb3e8 + 2c6ebb6 commit b1f3767
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,9 @@ MOCKGEN := $(TOOLS_BIN_DIR)/mockgen
RELEASE_NOTES := $(TOOLS_BIN_DIR)/release-notes

PATH := $(abspath $(TOOLS_BIN_DIR)):$(PATH)
DOCKER_CLI_EXPERIMENTAL=enabled
DOCKER_BUILDKIT=1
export PATH
export DOCKER_CLI_EXPERIMENTAL=enabled
export DOCKER_BUILDKIT=1

PODMAN ?= 0
ifeq ($(PODMAN), 1)
Expand Down
1 change: 0 additions & 1 deletion common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ include $(ROOT_DIR_RELATIVE)/versions.mk
# Ensure Make is run with bash shell as some syntax below is bash-specific
SHELL:=bash
.ONESHELL:
.EXPORT_ALL_VARIABLES:
.SHELLFLAGS := -eu -o pipefail -c
.DELETE_ON_ERROR:
MAKEFLAGS += --no-builtin-rules
Expand Down

0 comments on commit b1f3767

Please sign in to comment.