Skip to content

Commit 612ffa0

Browse files
authored
Merge pull request #17 from ajanikow/feature/ubi-redhat-certification
Add RedHat certification required fields
2 parents 8de6a7c + afc2526 commit 612ffa0

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

Dockerfile.scratch

+12-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
FROM scratch
2-
ARG GOARCH=amd64
32

3+
ARG VERSION
4+
LABEL name="arangodb-exporter" \
5+
vendor="ArangoDB" \
6+
version="${VERSION}" \
7+
release="${VERSION}" \
8+
summary="ArangoDD Exporter" \
9+
description="ArangoDB Exporter" \
10+
maintainer="[email protected]"
11+
12+
ADD ./LICENSE /licenses/LICENSE
13+
14+
ARG GOARCH=amd64
415
COPY bin/linux/${GOARCH}/arangodb-exporter /app/
516

617
EXPOSE 9101

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@ run-tests:
8989

9090
docker: check-vars build
9191
for arch in $(ARCHS); do \
92-
docker build --build-arg=GOARCH=$$arch -t $(DOCKERIMAGE)-$$arch -f Dockerfile.scratch . ; \
92+
docker build --build-arg "GOARCH=$$arch" --build-arg "VERSION=$(VERSION_MAJOR_MINOR_PATCH)" -t $(DOCKERIMAGE)-$$arch -f Dockerfile.scratch . ; \
9393
docker push $(DOCKERIMAGE)-$$arch ; \
9494
done
9595
for arch in amd64; do \
9696
sed -e 's|FROM scratch|FROM $(UBI)|' Dockerfile.scratch > Dockerfile.ubi ; \
97-
docker build --build-arg=GOARCH=$$arch -t $(DOCKERIMAGE)-ubi -f Dockerfile.ubi . ; \
97+
docker build --build-arg "GOARCH=$$arch" --build-arg "VERSION=$(VERSION_MAJOR_MINOR_PATCH)" -t $(DOCKERIMAGE)-ubi -f Dockerfile.ubi . ; \
9898
rm -f Dockerfile.ubi ; \
9999
docker push $(DOCKERIMAGE)-ubi ; \
100100
done

0 commit comments

Comments
 (0)