Skip to content

Commit

Permalink
added the port to fix the Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
shubhadapaithankar committed Aug 22, 2024
1 parent a850256 commit 62315f5
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ E2E_FLAGS ?= -test.v --ginkgo.v --ginkgo.timeout 180m --ginkgo.flake-attempts=2
E2E_LABEL ?= !smoke
GO_FLAGS ?= -tags=containers_image_openpgp,exclude_graphdriver_btrfs,exclude_graphdriver_devicemapper
NO_CACHE ?= true
PODMAN_REMOTE_ARGS ?=
PODMAN_REMOTE_ARGS ?= --url=ssh://[email protected]:50060/run/podman/podman.sock

export GOFLAGS=$(GO_FLAGS)

Expand Down Expand Up @@ -72,8 +72,14 @@ build-all:
aro: check-release generate
go build -ldflags "-X github.com/Azure/ARO-RP/pkg/util/version.GitCommit=$(VERSION)" ./cmd/aro

.PHONY: start-podman-service
start-podman-service:
@echo "Starting Podman service..."
@podman --log-level=debug system service --time=0 tcp://127.0.0.1:8888 > podmanlog 2>&1 &
@sleep 2 # Give the service time to start

# Target to create podman secrets
.PHONY: podman-secrets
.PHONY: podman-secrets start-podman-service
podman-secrets: aks.kubeconfig
podman $(PODMAN_REMOTE_ARGS) secret rm --ignore aks.kubeconfig
podman $(PODMAN_REMOTE_ARGS) secret create aks.kubeconfig ./aks.kubeconfig
Expand Down Expand Up @@ -177,7 +183,7 @@ az: pyenv
rm -f ~/.azure/commandIndex.json # https://github.com/Azure/azure-cli/issues/14997

.PHONY: azext-aro
azext-aro:
azext-aro: start-podman-service
podman $(PODMAN_REMOTE_ARGS) \
build . \
-f Dockerfile.ci-azext-aro \
Expand All @@ -197,7 +203,7 @@ client: generate
hack/build-client.sh "${AUTOREST_IMAGE}" 2020-04-30 2021-09-01-preview 2022-04-01 2022-09-04 2023-04-01 2023-07-01-preview 2023-09-04 2023-11-22 2024-08-12-preview

.PHONY: ci-rp
ci-rp: fix-macos-vendor
ci-rp: start-podman-service fix-macos-vendor
podman $(PODMAN_REMOTE_ARGS) \
build . \
-f Dockerfile.ci-rp \
Expand Down

0 comments on commit 62315f5

Please sign in to comment.