Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release #18

Merged
merged 7 commits into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading