Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@ WORKDIR /workspace
# Copy the Go Modules manifests
COPY go.mod go.mod
COPY go.sum go.sum
# Deps are downloaded as part of the build step below, not in a separate "go mod download"
# layer: go.mod lists the private sveltos-enterprise module (needed only for `-tags
# enterprise` builds), and unlike `go build`, bare `go mod download` is not build-tag-aware
# and would eagerly try to resolve it even for this default (non-enterprise) build.
RUN go mod download

# Copy the go source
COPY cmd/main.go cmd/main.go
Expand Down
52 changes: 0 additions & 52 deletions Dockerfile.enterprise

This file was deleted.

5 changes: 1 addition & 4 deletions Dockerfile_WithGit
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@ WORKDIR /workspace
# Copy the Go Modules manifests
COPY go.mod go.mod
COPY go.sum go.sum
# Deps are downloaded as part of the build step below, not in a separate "go mod download"
# layer: go.mod lists the private sveltos-enterprise module (needed only for `-tags
# enterprise` builds), and unlike `go build`, bare `go mod download` is not build-tag-aware
# and would eagerly try to resolve it even for this default (non-enterprise) build.
RUN go mod download

# Copy the go source
COPY cmd/main.go cmd/main.go
Expand Down
52 changes: 0 additions & 52 deletions Dockerfile_WithGit.enterprise

This file was deleted.

10 changes: 0 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@ K8S_LATEST_VER ?= $(shell curl -s https://dl.k8s.io/release/stable.txt)
export CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
TAG ?= main

# SSH key with read access to the private github.com/projectsveltos/sveltos-enterprise repo,
# forwarded into the enterprise docker-buildx build (see Dockerfile.enterprise) so it can
# fetch that module. Override with e.g. `make docker-buildx SVELTOS_ENTERPRISE_SSH_KEY=~/.ssh/other_key`.
SVELTOS_ENTERPRISE_SSH_KEY ?= $(HOME)/.ssh/id_ed25519

.PHONY: all
all: build

Expand Down Expand Up @@ -555,11 +550,6 @@ docker-build: ## Build docker image with the manager.
docker-push: ## Push docker image with the manager.
docker push $(CONTROLLER_IMG):$(TAG)

.PHONY: docker-buildx
docker-buildx: ## docker build for multiple arch and push to docker hub (enterprise build - requires SSH access to sveltos-enterprise)
docker buildx build --push --platform linux/amd64,linux/arm64 --ssh default=$(SVELTOS_ENTERPRISE_SSH_KEY) --build-arg GIT_VERSION=$(TAG) -t $(CONTROLLER_IMG):$(TAG) -f Dockerfile.enterprise .
docker buildx build --push --platform linux/amd64,linux/arm64 --ssh default=$(SVELTOS_ENTERPRISE_SSH_KEY) --build-arg GIT_VERSION=$(TAG) -t $(CONTROLLER_IMG)-git:$(TAG) -f Dockerfile_WithGit.enterprise .

.PHONY: load-image
load-image: docker-build $(KIND)
$(KIND) load docker-image $(CONTROLLER_IMG):$(TAG) --name $(CONTROL_CLUSTER_NAME)
Expand Down
Loading