From e3962a74db68587818541332e18946b0d8defc1c Mon Sep 17 00:00:00 2001 From: Markus Pesch Date: Mon, 8 Apr 2024 16:28:53 +0200 Subject: [PATCH] fix: add labels --- Dockerfile | 20 ++++++++++++++++---- Makefile | 6 +++--- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 67f2f61..c280bdf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,29 @@ -FROM docker.io/library/golang:1.21.6-alpine3.18 +FROM docker.io/library/golang:1.21.6-alpine3.18 as build ARG VERSION COPY ./ /workspace -RUN cd /workspace && \ - VERSION=${VERSION} \ - make all +WORKDIR /workspace + +RUN set -ex && \ + apk update && \ + apk add git make && \ + make all VERSION=${VERSION} # TARGET # ===================================================================== FROM docker.io/library/alpine:3.19 +ARG VERSION=latest + +LABEL org.opencontainers.image.authors="Markus Pesch" \ + org.opencontainers.image.description="Return network interface names" \ + org.opencontainers.image.documentation="https://git.cryptic.systems/volker.raschek/getidev#getidev" \ + org.opencontainers.image.title="getidev" \ + org.opencontainers.image.vendor="Markus Pesch" \ + org.opencontainers.image.version="${VERSION}" + COPY --from=build /workspace/getidev /usr/bin/getidev ENTRYPOINT [ "/usr/bin/getidev" ] diff --git a/Makefile b/Makefile index 7879390..f313601 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,8 @@ VERSION?=$(shell git describe --abbrev=0)+hash.$(shell git rev-parse --short HEA CONTAINER_RUNTIME?=$(shell which podman) # CONTAINER_IMAGE -CONTAINER_IMAGE_REGISTRY_HOST?=docker.io -CONTAINER_IMAGE_REPOSITORY=volkerraschek/getidev +CONTAINER_IMAGE_REGISTRY_HOST?=git.cryptic.systems +CONTAINER_IMAGE_REPOSITORY=volker.raschek/getidev CONTAINER_IMAGE_VERSION?=latest CONTAINER_IMAGE_FULLY_QUALIFIED=${CONTAINER_IMAGE_REGISTRY_HOST}/${CONTAINER_IMAGE_REPOSITORY}:${CONTAINER_IMAGE_VERSION} @@ -24,7 +24,7 @@ getidev: # ============================================================================== PHONY+=clean clean: - rm --force --recursive $(shell pwd)/getidev* + rm -f -r $(shell pwd)/getidev* # GOLANGCI-LINT # ==============================================================================