Skip to content

Commit

Permalink
Added Docker labels
Browse files Browse the repository at this point in the history
  • Loading branch information
Forinil authored and vogel76 committed Feb 22, 2024
1 parent b9a26d6 commit 288efc7
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 0 deletions.
22 changes: 22 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,28 @@ RUN turbo run build --filter=${TURBO_APP_SCOPE}

FROM base AS runner
ARG TURBO_APP_PATH
ARG TURBO_APP_NAME
ARG BUILD_TIME
ARG GIT_COMMIT_SHA
ARG GIT_CURRENT_BRANCH
ARG GIT_LAST_LOG_MESSAGE
ARG GIT_LAST_COMMITTER
ARG GIT_LAST_COMMIT_DATE
LABEL org.opencontainers.image.created="$BUILD_TIME"
LABEL org.opencontainers.image.url="https://hive.io/"
LABEL org.opencontainers.image.documentation="https://gitlab.syncad.com/hive/denser"
LABEL org.opencontainers.image.source="https://gitlab.syncad.com/hive/denser"
#LABEL org.opencontainers.image.version="${VERSION}"
LABEL org.opencontainers.image.revision="$GIT_COMMIT_SHA"
LABEL org.opencontainers.image.licenses="MIT"
LABEL org.opencontainers.image.ref.name="Denser $TURBO_APP_NAME"
LABEL org.opencontainers.image.title="Denser $TURBO_APP_NAME Image"
LABEL org.opencontainers.image.description="Runs Denser $TURBO_APP_NAME application"
LABEL io.hive.image.branch="$GIT_CURRENT_BRANCH"
LABEL io.hive.image.commit.log_message="$GIT_LAST_LOG_MESSAGE"
LABEL io.hive.image.commit.author="$GIT_LAST_COMMITTER"
LABEL io.hive.image.commit.date="$GIT_LAST_COMMIT_DATE"

WORKDIR /app

RUN npm i -g @beam-australia/[email protected]
Expand Down
13 changes: 13 additions & 0 deletions docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ variable "TAG" {
variable "TURBO_APP_SCOPE" {}
variable "TURBO_APP_PATH" {}
variable "TURBO_APP_NAME" {}
variable "BUILD_TIME" {}
variable "GIT_COMMIT_SHA" {}
variable "GIT_CURRENT_BRANCH" {}
variable "GIT_LAST_LOG_MESSAGE" {}
variable "GIT_LAST_COMMITTER" {}
variable "GIT_LAST_COMMIT_DATE" {}

function "notempty" {
params = [variable]
Expand All @@ -25,6 +31,13 @@ target "local-build" {
args = {
TURBO_APP_SCOPE = "${TURBO_APP_SCOPE}",
TURBO_APP_PATH = "${TURBO_APP_PATH}",
TURBO_APP_NAME = "${TURBO_APP_NAME}",
BUILD_TIME = "${BUILD_TIME}",
GIT_COMMIT_SHA = "${GIT_COMMIT_SHA}",
GIT_CURRENT_BRANCH = "${GIT_CURRENT_BRANCH}",
GIT_LAST_LOG_MESSAGE = "${GIT_LAST_LOG_MESSAGE}",
GIT_LAST_COMMITTER = "${GIT_LAST_COMMITTER}",
GIT_LAST_COMMIT_DATE = "${GIT_LAST_COMMIT_DATE}",
}
output = [
"type=docker"
Expand Down
40 changes: 40 additions & 0 deletions scripts/build_instance.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,46 @@ fi

pushd "$SRCROOTDIR"

# All the variables below must be declared and assigned separately
# for 'set -e' to work correctly. See https://www.shellcheck.net/wiki/SC2155
# for an explanation

BUILD_TIME="$(date -uIseconds)"
export BUILD_TIME

GIT_COMMIT_SHA="$(git rev-parse HEAD || true)"
if [ -z "$GIT_COMMIT_SHA" ]; then
GIT_COMMIT_SHA="[unknown]"
fi
export GIT_COMMIT_SHA

GIT_CURRENT_BRANCH="$(git branch --show-current || true)"
if [ -z "$GIT_CURRENT_BRANCH" ]; then
GIT_CURRENT_BRANCH="$(git describe --abbrev=0 --all | sed 's/^.*\///' || true)"
if [ -z "$GIT_CURRENT_BRANCH" ]; then
GIT_CURRENT_BRANCH="[unknown]"
fi
fi
export GIT_CURRENT_BRANCH

GIT_LAST_LOG_MESSAGE="$(git log -1 --pretty=%B || true)"
if [ -z "$GIT_LAST_LOG_MESSAGE" ]; then
GIT_LAST_LOG_MESSAGE="[unknown]"
fi
export GIT_LAST_LOG_MESSAGE

GIT_LAST_COMMITTER="$(git log -1 --pretty="%an <%ae>" || true)"
if [ -z "$GIT_LAST_COMMITTER" ]; then
GIT_LAST_COMMITTER="[unknown]"
fi
export GIT_LAST_COMMITTER

GIT_LAST_COMMIT_DATE="$(git log -1 --pretty="%aI" || true)"
if [ -z "$GIT_LAST_COMMIT_DATE" ]; then
GIT_LAST_COMMIT_DATE="[unknown]"
fi
export GIT_LAST_COMMIT_DATE

./scripts/write-version.sh ".${TURBO_APP_PATH}/version.json"
docker buildx bake --provenance=false --progress="$PROGRESS_DISPLAY" "$TARGET"

Expand Down

0 comments on commit 288efc7

Please sign in to comment.