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.

Sign up for GitHub

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

Jump to bottom

Fix and optimize generator Docker image building #1045

Merged
merged 2 commits into from
Nov 21, 2023
Merged

Fix and optimize generator Docker image building #1045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b924387
Fix Docker image of generator always pointing to latest tag
hhromic Nov 11, 2023
0ba4381
Optimize Docker image of generator
hhromic Nov 11, 2023
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
8 changes: 4 additions & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ jobs:
steps:
- prometheus/setup_build_environment:
docker_version: ""
- run: make -C generator docker DOCKER_IMAGE_TAG=main
- run: make -C generator docker DOCKER_REPO=quay.io/prometheus DOCKER_IMAGE_TAG=main
- run: make -C generator docker REPO_TAG=main DOCKER_IMAGE_TAG=main
- run: make -C generator docker REPO_TAG=main DOCKER_REPO=quay.io/prometheus DOCKER_IMAGE_TAG=main
- run: docker images
- run: docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
- run: docker login -u $QUAY_LOGIN -p $QUAY_PASSWORD quay.io
Expand All @@ -67,8 +67,8 @@ jobs:
steps:
- prometheus/setup_build_environment:
docker_version: ""
- run: make -C generator docker DOCKER_IMAGE_TAG=$CIRCLE_TAG
- run: make -C generator docker DOCKER_IMAGE_TAG=$CIRCLE_TAG DOCKER_REPO=quay.io/prometheus
- run: make -C generator docker REPO_TAG=$CIRCLE_TAG DOCKER_IMAGE_TAG=$CIRCLE_TAG
- run: make -C generator docker REPO_TAG=$CIRCLE_TAG DOCKER_IMAGE_TAG=$CIRCLE_TAG DOCKER_REPO=quay.io/prometheus
- run: docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
- run: docker login -u $QUAY_LOGIN -p $QUAY_PASSWORD quay.io
- run: |
Expand Down
22 changes: 16 additions & 6 deletions generator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
FROM golang:latest
FROM golang:bookworm AS builder

RUN apt-get update && \
apt-get install -y libsnmp-dev unzip && \
go install github.com/prometheus/snmp_exporter/generator@latest
RUN apt-get update \
&& apt-get install -y --no-install-recommends libsnmp-dev

ARG REPO_TAG=main
RUN go install github.com/prometheus/snmp_exporter/generator@"$REPO_TAG"

FROM debian:bookworm-slim

WORKDIR "/opt"

ENTRYPOINT ["/go/bin/generator"]
ENTRYPOINT ["/bin/generator"]

ENV MIBDIRS mibs
ENV MIBDIRS=mibs

CMD ["generate"]

RUN apt-get update \
&& apt-get install -y --no-install-recommends libsnmp40 \
&& rm -rf /var/lib/apt/lists/*

COPY --from=builder /go/bin/generator /bin/generator
6 changes: 4 additions & 2 deletions generator/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ MIB_PATH := 'mibs'

CURL_OPTS ?= -L --no-progress-meter --retry 3 --retry-delay 3 --fail

REPO_TAG ?= $(shell git rev-parse --abbrev-ref HEAD)

DOCKER_IMAGE_NAME ?= snmp-generator
DOCKER_IMAGE_TAG ?= $(subst /,-,$(shell git rev-parse --abbrev-ref HEAD))
DOCKER_IMAGE_TAG ?= $(subst /,-,$(REPO_TAG))
DOCKER_REPO ?= prom

SANITIZED_DOCKER_IMAGE_TAG := $(subst +,-,$(DOCKER_IMAGE_TAG))
Expand Down Expand Up @@ -79,7 +81,7 @@ parse_errors: generator mibs

.PHONY: docker
docker:
docker build -t "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(SANITIZED_DOCKER_IMAGE_TAG)" .
docker build --build-arg REPO_TAG="$(REPO_TAG)" -t "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(SANITIZED_DOCKER_IMAGE_TAG)" .

.PHONY: docker-generate
docker-generate: docker mibs
Expand Down