From 5b36d95392bd59eb8629d4e4a8ca5d87feadc46c Mon Sep 17 00:00:00 2001
From: trent-codecov <trent@codecov.io>
Date: Tue, 16 Apr 2024 13:46:32 -0400
Subject: [PATCH] Add merge group

Add docker lables

Update berglas
---
 .github/workflows/ci.yml | 1 +
 Makefile                 | 8 +++++++-
 docker/Dockerfile        | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5edeac321..3391a9242 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,6 +8,7 @@ on:
       - main
       - staging
   pull_request:
+  merge_group:
 
 permissions:
   contents: 'read'
diff --git a/Makefile b/Makefile
index fdc99d4e2..80b4cd6dc 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ export WORKER_DOCKER_VERSION=${VERSION}
 export CODECOV_TOKEN=${CODECOV_UPLOAD_TOKEN}
 
 # Codecov CLI version to use
-CODECOV_CLI_VERSION := 0.4.6
+CODECOV_CLI_VERSION := 0.5.1
 
 build:
 	$(MAKE) build.requirements
@@ -96,6 +96,10 @@ build.app:
 	docker build -f docker/Dockerfile . \
 		-t ${AR_REPO}:latest \
 		-t ${AR_REPO}:${VERSION} \
+		--label "org.label-schema.vendor"="Codecov" \
+		--label "org.label-schema.version"="${release_version}-${sha}" \
+		--label "org.opencontainers.image.revision"="$(full_sha)" \
+		--label "org.opencontainers.image.source"="github.com/codecov/worker" \
 		--build-arg REQUIREMENTS_IMAGE=${AR_REPO}:${REQUIREMENTS_TAG} \
 		--build-arg RELEASE_VERSION=${VERSION} \
 		--build-arg BUILD_ENV=cloud
@@ -116,6 +120,8 @@ build.self-hosted-runtime:
 	docker build -f docker/Dockerfile . \
 		-t ${DOCKERHUB_REPO}:latest \
 		-t ${DOCKERHUB_REPO}:${VERSION} \
+		--label "org.label-schema.vendor"="Codecov" \
+		--label "org.label-schema.version"="${release_version}-${sha}" \
 		--build-arg REQUIREMENTS_IMAGE=${AR_REPO}:${REQUIREMENTS_TAG} \
         --build-arg RELEASE_VERSION=${VERSION} \
         --build-arg BUILD_ENV=self-hosted-runtime
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 595731064..7366a95d5 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.4
 ARG REQUIREMENTS_IMAGE
 ARG BUILD_ENV=self-hosted
-ARG BERGLAS_VERSION=1.0.3
+ARG BERGLAS_VERSION=2.0.2
 
 FROM us-docker.pkg.dev/berglas/berglas/berglas:$BERGLAS_VERSION as berglas