Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 Fix broken make dev-deploy script #290

Merged
merged 1 commit into from
Aug 7, 2024
Merged

🐛 Fix broken make dev-deploy script #290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ commits_since_latest_tag=$(shell git log --oneline $(latest_tag)..HEAD | wc -l)
GO_TEST_PACKAGES=$(shell go list ./... | grep -v /vendor/)

# Deployment vars
# The following variables are used to define the deployment environment
# The following variables are used to define the deployment environment
# e.g. what are the versions of the components, or the container registry, these are used by make targets that deploy things
CONTAINER_REPO=ghcr.io/ocurity/dracon
SOURCE_CODE_REPO=https://github.com/ocurity/dracon
Expand Down Expand Up @@ -248,8 +248,8 @@ install: deploy-cluster deploy-elasticoperator deploy-arangodb-crds add-bitnami-
--wait

@echo "Installing Components"
# we are setting the container repo on itself is so we can override the container repo and package url from other make targets
# e.g. when installing oss components from locally built components we want to make install with container_repo being kind-registry, and the package_url being the component tar.gz
# we are setting the container repo to it's own value so that we can override it from other make targets
# e.g. when installing oss components from locally built components, we want to `make install` with CONTAINER_REPO being the kind-registry, and the package_url being the component tar.gz
$(MAKE) install-oss-components CONTAINER_REPO=$(CONTAINER_REPO) DRACON_OSS_COMPONENTS_PACKAGE_URL=$(DRACON_OSS_COMPONENTS_PACKAGE_URL)

dev-deploy-oss-components:
Expand All @@ -268,8 +268,8 @@ install-oss-components:
@echo "Done! Bumped version to $(DRACON_VERSION)"

dev-build-oss-components: cmd/draconctl/bin
@echo "Updating open-source components in local dracon instance..."
$(eval CONTAINER_REPO:=localhost:5000/ocurity/dracon)
@echo "Building open-source components for local dracon instance..."
$(eval CONTAINER_REPO:=localhost:5000)

$(MAKE) -j 16 publish-component-containers CONTAINER_REPO=$(CONTAINER_REPO)
@./bin/cmd/draconctl components package \
Expand All @@ -279,9 +279,9 @@ dev-build-oss-components: cmd/draconctl/bin
./components

dev-dracon:
$(eval CONTAINER_REPO:=localhost:5000/ocurity/dracon)
$(eval CONTAINER_REPO:=localhost:5000)
$(eval DRACON_OSS_COMPONENTS_PACKAGE_URL:=./$(DRACON_OSS_COMPONENTS_NAME)-$(DRACON_VERSION).tgz)
$(eval IN_CLUSTER_CONTAINER_REPO:=kind-registry:5000/ocurity/dracon)
$(eval IN_CLUSTER_CONTAINER_REPO:=kind-registry:5000)

$(MAKE) -j 16 publish-containers CONTAINER_REPO=$(CONTAINER_REPO)
$(MAKE) -j 16 dev-build-oss-components CONTAINER_REPO=$(CONTAINER_REPO)
Expand Down