From 3eb9af0c78e95fc412ca9814bec93e2e902a498b Mon Sep 17 00:00:00 2001 From: lumbrjx Date: Fri, 30 Aug 2024 22:50:44 +0100 Subject: [PATCH 1/3] update --- daemon/api/grpc/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/api/grpc/Dockerfile b/daemon/api/grpc/Dockerfile index 124592d..416dc58 100644 --- a/daemon/api/grpc/Dockerfile +++ b/daemon/api/grpc/Dockerfile @@ -36,7 +36,7 @@ RUN apt-get update && \ clang \ llvm \ libelf-dev \ - linux-headers-6.1.0-22-amd64 \ + linux-headers-$(uname -r) \ build-essential \ iproute2 \ libbpf-dev \ From 773ab85dd788227050e44dc15827ca1c683873df Mon Sep 17 00:00:00 2001 From: lumbrjx Date: Fri, 30 Aug 2024 23:01:02 +0100 Subject: [PATCH 2/3] CI :construction_worker: Remove Daemon build and push --- .github/workflows/builds.yml | 4 ---- Makefile | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 428a526..91e25ac 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -43,10 +43,6 @@ jobs: - name: Build and push Daemon, Controller Docker images run: | - make build-daemon TAG=${{ github.sha }} - make push-daemon TAG=${{ github.sha }} - docker tag ${{ env.DAEMON_IMAGE_NAME }}:${{ github.sha }} ${{ env.DAEMON_IMAGE_NAME }}:staging - docker push ${{ env.DAEMON_IMAGE_NAME }}:staging make build-controller TAG=${{ github.sha }} make push-controller TAG=${{ github.sha }} docker tag ${{ env.CONTROLLER_IMAGE_NAME }}:${{ github.sha }} ${{ env.CONTROLLER_IMAGE_NAME}}:staging diff --git a/Makefile b/Makefile index 86dd59c..c11752b 100644 --- a/Makefile +++ b/Makefile @@ -39,6 +39,12 @@ build-daemon: fi docker build -f daemon/api/grpc/Dockerfile -t lumbrjx/obzev0-grpc-daemon:$$TAG . +build-daemon-stage: + docker build -f daemon/api/grpc/Dockerfile -t lumbrjx/obzev0-grpc-daemon:staging . +push-daemon-stage: + docker push lumbrjx/obzev0-grpc-daemon:staging . + + build-controller: @if [ -z "$$TAG" ]; then \ echo "Usage: make build-controller TAG="; \ From f252daec1c62c00e6d12764c7227e05fdb8972a1 Mon Sep 17 00:00:00 2001 From: lumbrjx Date: Fri, 30 Aug 2024 23:14:05 +0100 Subject: [PATCH 3/3] BugFix :bug: fix makefile builds --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c11752b..80f9529 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,7 @@ build-controller: echo "Usage: make build-controller TAG="; \ exit 1; \ fi - docker build -f controller/Dockerfile -t lumbrjx/obzev0poc:$$TAG . + docker build -f controller/Dockerfile -t lumbrjx/obzev0-k8s-controller:$$TAG . push-daemon: @if [ -z "$$TAG" ]; then \ @@ -64,7 +64,7 @@ push-controller: echo "Usage: make push-controller TAG="; \ exit 1; \ fi - docker push lumbrjx/obzev0poc:$$TAG + docker push lumbrjx/obzev0-k8s-controller:$$TAG generate-proto: @if [ -z "$$PROTO_PATH" ]; then \