Skip to content

Commit ab4eaaa

Browse files
authored
fix: build ubi image only for specific platforms (#105)
* feat: build ubi image only for specific platforms Signed-off-by: Dominik Rosiek <drosiek@sumologic.com> * feat: fix dev builds Signed-off-by: Dominik Rosiek <drosiek@sumologic.com> --------- Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
1 parent 3253d3b commit ab4eaaa

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-6
lines changed

.github/workflows/dev_builds.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- main
7+
- "dev-build/*"
78

89
jobs:
910
setup-image:
@@ -39,7 +40,8 @@ jobs:
3940
- name: Build and push UBI image to Open Source ECR
4041
run: make build-push-multiplatform \
4142
DOCKERFILE=Dockerfile-ubi \
42-
TAG_SUFFIX=-ubi
43+
TAG_SUFFIX=-ubi \
44+
PLATFORMS=linux/amd64,linux/arm64
4345

4446
- name: Build and push image to Docker Hub
4547
run: |-
@@ -50,5 +52,6 @@ jobs:
5052
run: |-
5153
make build-push-multiplatform \
5254
REPO_URL=sumologic/kubernetes-setup \
53-
DOCKERFILE=Dockerfile-ubi
54-
TAG_SUFFIX=-ubi
55+
DOCKERFILE=Dockerfile-ubi \
56+
TAG_SUFFIX=-ubi \
57+
PLATFORMS=linux/amd64,linux/arm64

.github/workflows/release_builds.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ jobs:
5050
run: make build-push-multiplatform \
5151
BUILD_TAG=${{ steps.extract_tag.outputs.tag }} \
5252
TAG_SUFFIX=-ubi \
53-
DOCKERFILE=Dockerfile-ubi
53+
DOCKERFILE=Dockerfile-ubi \
54+
PLATFORMS=linux/amd64,linux/arm64
5455

5556
- name: Build and push image to Docker Hub
5657
run: |-
@@ -64,4 +65,5 @@ jobs:
6465
BUILD_TAG=${{ steps.extract_tag.outputs.tag }} \
6566
REPO_URL=sumologic/kubernetes-setup \
6667
TAG_SUFFIX=-ubi \
67-
DOCKERFILE=Dockerfile-ubi
68+
DOCKERFILE=Dockerfile-ubi \
69+
PLATFORMS=linux/amd64,linux/arm64

Dockerfile-ubi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ LABEL name="Sumo Logic Kubernetes Setup" \
4646
release="1" \
4747
summary="$SUMMARY" \
4848
description="$DESCRIPTION" \
49+
io.k8s.description="$DESCRIPTION" \
4950
maintainer="opensource-collection-team@sumologic.com"
5051

5152
ADD LICENSE \

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ ECR_URL = public.ecr.aws/sumologic
44
REPO_URL = $(ECR_URL)/$(IMAGE_NAME)
55
DOCKERFILE = Dockerfile
66
TAG_SUFFIX = ""
7+
PLATFORMS = linux/amd64,linux/arm/v7,linux/arm64
78

89
build:
910
DOCKER_BUILDKIT=1 docker build \
@@ -26,7 +27,7 @@ build-push-multiplatform:
2627
docker buildx build \
2728
-f $(DOCKERFILE) \
2829
--push \
29-
--platform linux/amd64,linux/arm/v7,linux/arm64 \
30+
--platform $(PLATFORMS) \
3031
--build-arg BUILD_TAG=$(BUILD_TAG)$(TAG_SUFFIX) \
3132
--tag $(REPO_URL):$(BUILD_TAG)$(TAG_SUFFIX) \
3233
.

0 commit comments

Comments
 (0)