Skip to content

Commit

Permalink
fix(protoc): update packagemanager to tdnf , re-run make proto-gen (#…
Browse files Browse the repository at this point in the history
…1106)

# Description

Update `Dockerfile.proto` as the image was changed a while ago and it
broke `make proto-gen` since the wrong package manger was called.

Also update `[email protected]` - which is the same version we used
to generate `pkg/utils/metadata_linux.pb.go`

## Related Issue

#1083 

## Checklist

- [x] I have read the [contributing
documentation](https://retina.sh/docs/contributing).
- [x] I signed and signed-off the commits (`git commit -S -s ...`). See
[this
documentation](https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification)
on signing commits.
- [x] I have correctly attributed the author(s) of the code.
- [x] I have tested the changes locally.
- [x] I have followed the project's style guidelines.
- [x] I have updated the documentation, if necessary.
- [x] I have added tests, if applicable.

## Screenshots (if applicable) or Testing Completed

Please add any relevant screenshots or GIFs to showcase the changes
made.

## Additional Notes

Add any additional notes or context about the pull request here.

---

Please refer to the [CONTRIBUTING.md](../CONTRIBUTING.md) file for more
information on how to contribute to this project.
  • Loading branch information
SRodi authored Dec 9, 2024
1 parent 234edc5 commit 4b12472
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 72 deletions.
7 changes: 3 additions & 4 deletions controller/Dockerfile.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang@sha256:

LABEL Name=retina-builder Version=0.0.1

RUN apt-get update &&\
apt-get -y install lsb-release wget software-properties-common gnupg file git make unzip
RUN tdnf install -y unzip

WORKDIR /tmp

RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.31.0
RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.34.2
RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v24.2/protoc-24.2-linux-x86_64.zip
RUN unzip protoc-24.2-linux-x86_64.zip -d protoc
RUN mv protoc/bin/protoc /usr/bin/protoc

WORKDIR /app
ENTRYPOINT protoc -I=. --go_out=paths=source_relative:. ./pkg/utils/metadata.proto
ENTRYPOINT protoc -I=. --go_out=paths=source_relative:. ./pkg/utils/metadata_linux.proto
137 changes: 69 additions & 68 deletions pkg/utils/metadata_linux.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4b12472

Please sign in to comment.