fix: GoReleaser manifest (#1135)

Signed-off-by: Daniel Pacak <pacak.daniel@gmail.com>
aquasecurity · Apr 12, 2022 · 92124cd · 92124cd
1 parent 7562f68
commit 92124cd
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 22 deletions.
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -115,7 +115,7 @@ dockers:
       - "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi8-amd64"
     use: buildx
     goos: linux
-    dockerfile: build/starboard-operator-ubi8/Dockerfile.ubi8
+    dockerfile: build/starboard-operator/Dockerfile.ubi8
     goarch: amd64
     ids:
       - starboard-operator
@@ -129,7 +129,6 @@ dockers:
       - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
       - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
       - "--platform=linux/amd64"
-
   - image_templates:
       - "docker.io/aquasec/starboard-scanner-aqua:{{ .Version }}-amd64"
     use: buildx
@@ -188,8 +187,8 @@ dockers:
       - "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi8-arm64"
     use: buildx
     goos: linux
-    dockerfile: build/starboard-operator-ubi8/Dockerfile.ubi8
-    goarch: amd64
+    dockerfile: build/starboard-operator/Dockerfile.ubi8
+    goarch: arm64
     ids:
       - starboard-operator
     build_flag_templates:
@@ -256,11 +255,29 @@ dockers:
       - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
       - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
       - "--platform=linux/s390x"
+  - image_templates:
+      - "docker.io/aquasec/starboard-operator:{{ .Version }}-ppc64le"
+    use: buildx
+    goos: linux
+    dockerfile: build/starboard-operator/Dockerfile
+    goarch: ppc64le
+    ids:
+      - starboard-operator
+    build_flag_templates:
+      - "--label=org.opencontainers.image.title=starboard-operator"
+      - "--label=org.opencontainers.image.description=Keeps Starboard resources updated"
+      - "--label=org.opencontainers.image.vendor=Aqua Security"
+      - "--label=org.opencontainers.image.version={{ .Version }}"
+      - "--label=org.opencontainers.image.created={{ .Date }}"
+      - "--label=org.opencontainers.image.source=https://github.com/aquasecurity/starboard"
+      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
+      - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/starboard/v{{ .Version }}/"
+      - "--platform=linux/ppc64le"
   - image_templates:
       - "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi8-s390x"
     use: buildx
     goos: linux
-    dockerfile: build/starboard-operator-ubi8/Dockerfile.ubi8
+    dockerfile: build/starboard-operator/Dockerfile.ubi8
     goarch: s390x
     ids:
       - starboard-operator
@@ -296,7 +313,7 @@ dockers:
       - "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi8-ppc64le"
     use: buildx
     goos: linux
-    dockerfile: build/starboard-operator-ubi8/Dockerfile.ubi8
+    dockerfile: build/starboard-operator/Dockerfile.ubi8
     goarch: ppc64le
     ids:
       - starboard-operator
@@ -321,14 +338,15 @@ docker_manifests:
       - "aquasec/starboard-operator:{{ .Version }}-amd64"
       - "aquasec/starboard-operator:{{ .Version }}-arm64"
       - "aquasec/starboard-operator:{{ .Version }}-s390x"
+      - "aquasec/starboard-operator:{{ .Version }}-ppc64le"
+  - name_template: "aquasec/starboard-operator:{{ .Version }}-ubi8"
+    image_templates:
+      - "aquasec/starboard-operator:{{ .Version }}-ubi8-amd64"
+      - "aquasec/starboard-operator:{{ .Version }}-ubi8-arm64"
+      - "aquasec/starboard-operator:{{ .Version }}-ubi8-s390x"
+      - "aquasec/starboard-operator:{{ .Version }}-ubi8-ppc64le"
   - name_template: "aquasec/starboard-scanner-aqua:{{ .Version }}"
     image_templates:
       - "aquasec/starboard-scanner-aqua:{{ .Version }}-amd64"
       - "aquasec/starboard-scanner-aqua:{{ .Version }}-arm64"
       - "aquasec/starboard-scanner-aqua:{{ .Version }}-s390x"
-  - name_template: "aquasec/starboard-operator:{{ .Version }}-ubi8"
-    image_templates:
-      - "aquasec/starboard-scanner-aqua:{{ .Version }}-ubi8-amd64"
-      - "aquasec/starboard-scanner-aqua:{{ .Version }}-ubi8-arm64"
-      - "aquasec/starboard-scanner-aqua:{{ .Version }}-ubi8-s390x"
-      - "aquasec/starboard-scanner-aqua:{{ .Version }}-ubi8-ppc64le"
diff --git a/Makefile b/Makefile
@@ -1,5 +1,9 @@
 # Set the default goal
 .DEFAULT_GOAL := build
+MAKEFLAGS += --no-print-directory
+
+DOCKER ?= docker
+KIND ?= kind
 
 export KUBECONFIG ?= ${HOME}/.kube/config
 
@@ -116,34 +120,52 @@ else
 	@echo "KUBECONFIG=${KUBECONFIG}"
 endif
 
-.PHONY: clean
 ## Removes build artifacts
 clean:
 	@rm -r ./bin 2> /dev/null || true
 	@rm -r ./dist 2> /dev/null || true
 
-.PHONY: docker-build
 ## Builds Docker images for all binaries
-docker-build: docker-build-starboard-cli docker-build-starboard-operator docker-build-starboard-scanner-aqua docker-build-starboard-operator-ubi8
+docker-build: \
+	docker-build-starboard-cli \
+	docker-build-starboard-operator \
+	docker-build-starboard-operator-ubi8 \
+	docker-build-starboard-scanner-aqua
 
 ## Builds Docker image for Starboard CLI
 docker-build-starboard-cli: build-starboard-cli
-	docker build --no-cache -t $(STARBOARD_CLI_IMAGE) -f build/starboard/Dockerfile bin
+	$(DOCKER) build --no-cache -t $(STARBOARD_CLI_IMAGE) -f build/starboard/Dockerfile bin
 
 ## Builds Docker image for Starboard operator
 docker-build-starboard-operator: build-starboard-operator
-	docker build --no-cache -t $(STARBOARD_OPERATOR_IMAGE) -f build/starboard-operator/Dockerfile bin
+	$(DOCKER) build --no-cache -t $(STARBOARD_OPERATOR_IMAGE) -f build/starboard-operator/Dockerfile bin
 
 ## Builds Docker image for Starboard operator ubi8
 docker-build-starboard-operator-ubi8: build-starboard-operator
-	docker build --no-cache -f build/starboard-operator-ubi8/Dockerfile.ubi8 -t $(STARBOARD_OPERATOR_IMAGE_UBI8) bin
+	$(DOCKER) build --no-cache -f build/starboard-operator/Dockerfile.ubi8 -t $(STARBOARD_OPERATOR_IMAGE_UBI8) bin
 
 ## Builds Docker image for Aqua scanner
 docker-build-starboard-scanner-aqua: build-starboard-scanner-aqua
-	docker build --no-cache -t $(STARBOARD_SCANNER_AQUA_IMAGE) -f build/scanner-aqua/Dockerfile bin
+	$(DOCKER) build --no-cache -t $(STARBOARD_SCANNER_AQUA_IMAGE) -f build/scanner-aqua/Dockerfile bin
+
+kind-load-images: \
+	docker-build-starboard-operator \
+	docker-build-starboard-operator-ubi8
+	$(KIND) load docker-image \
+		$(STARBOARD_OPERATOR_IMAGE) \
+		$(STARBOARD_OPERATOR_IMAGE_UBI8)
 
-.PHONY: mkdocs-serve
 ## Runs MkDocs development server to preview the documentation page
 mkdocs-serve:
-	docker build -t $(MKDOCS_IMAGE) -f build/mkdocs-material/Dockerfile bin
-	docker run --name mkdocs-serve --rm -v $(PWD):/docs -p $(MKDOCS_PORT):8000 $(MKDOCS_IMAGE)
+	$(DOCKER) build -t $(MKDOCS_IMAGE) -f build/mkdocs-material/Dockerfile bin
+	$(DOCKER) run --name mkdocs-serve --rm -v $(PWD):/docs -p $(MKDOCS_PORT):8000 $(MKDOCS_IMAGE)
+
+.PHONY: \
+	clean \
+	docker-build \
+	docker-build-starboard-cli \
+	docker-build-starboard-operator \
+	docker-build-starboard-operator-ubi8 \
+	docker-build-starboard-scanner-aqua \
+	kind-load-images \
+	mkdocs-serve
diff --git a/...d/starboard-operator-ubi8/Dockerfile.ubi8 → build/starboard-operator/Dockerfile.ubi8 b/...d/starboard-operator-ubi8/Dockerfile.ubi8 → build/starboard-operator/Dockerfile.ubi8