Skip to content

Commit

Permalink
Merge pull request #18 from lumbrjx/release
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
lumbrjx authored Aug 30, 2024
2 parents fea2943 + 72e10de commit f7db86d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 8 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,18 @@ 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=<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 \
Expand All @@ -58,7 +64,7 @@ push-controller:
echo "Usage: make push-controller TAG=<tag>"; \
exit 1; \
fi
docker push lumbrjx/obzev0poc:$$TAG
docker push lumbrjx/obzev0-k8s-controller:$$TAG

generate-proto:
@if [ -z "$$PROTO_PATH" ]; then \
Expand Down
2 changes: 1 addition & 1 deletion daemon/api/grpc/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit f7db86d

Please sign in to comment.