From c2b893bfb3241ecbfa7467ab426374e53bd9e4bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20G=C3=A9rczei?= Date: Sun, 19 Jul 2020 09:53:54 +0200 Subject: [PATCH] proper labels, bumped default versions --- Dockerfile | 15 ++++++++++++--- hooks/build | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index e376c33..c3a8602 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,17 @@ -ARG GOVERSION="1.14.2" +ARG GOVERSION="1.14.6" FROM golang:${GOVERSION}-alpine AS buildenv ARG REPO="https://gitea.com/gitea/tea.git" -ARG VERSION="0.3.0" +ARG VERSION="0.4.0" ENV TEA_VERSION="${VERSION}" ARG CGO_ENABLED="0" ARG GOOS="linux" +ARG BUILD_DATE + WORKDIR $GOPATH/src RUN apk add --quiet --no-cache git && \ @@ -25,7 +27,14 @@ RUN apk add --quiet --no-cache git && \ go build -v -a -ldflags "-X main.Version=${TEA_VERSION}" -o /tea . FROM scratch -LABEL maintainer="Tamás Gérczei " +LABEL org.opencontainers.image.title="Gitea - Git with a cup of tea" +LABEL org.opencontainers.image.description="A command line tool to interact with Gitea servers" +LABEL org.opencontainers.image.version="${TEA_VERSION} +LABEL org.opencontainers.image.url="https://gitea.com/gitea/tea" +LABEL org.opencontainers.image.authors="Tamás Gérczei " +LABEL org.opencontainers.image.created="${BUILD_DATE}" +LABEL org.opencontainers.image.source="https://github.com/tgerczei/conteaner" +LABEL org.opencontainers.image.vendor="Gérczei Tamás E.V." COPY --from=buildenv /tea / ENV HOME="/app" ENTRYPOINT ["/tea"] diff --git a/hooks/build b/hooks/build index 365307f..925f118 100644 --- a/hooks/build +++ b/hooks/build @@ -1,2 +1,2 @@ #!/bin/sh -docker build --build-arg VERSION=development -t $IMAGE_NAME . +docker build --build-arg VERSION=development --build-arg BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ) -t $IMAGE_NAME .