automatically derive image version
This commit is contained in:
parent
df7b5416e6
commit
7d62be1781
|
@ -4,11 +4,6 @@
|
||||||
# change is that the Hugo version is now an overridable argument rather than a fixed
|
# change is that the Hugo version is now an overridable argument rather than a fixed
|
||||||
# environment variable.
|
# environment variable.
|
||||||
|
|
||||||
# Bump this by 1 whenever you change the Dockerfile below, e.g. if
|
|
||||||
# `DOCKERFFILE_VERSION=1` then change this to `DOCKERFILE_VERSION=2` when you
|
|
||||||
# change something else in this file.
|
|
||||||
# DOCKERFILE_VERSION=0
|
|
||||||
|
|
||||||
FROM alpine:latest
|
FROM alpine:latest
|
||||||
|
|
||||||
LABEL maintainer="Luc Perkins <lperkins@linuxfoundation.org>"
|
LABEL maintainer="Luc Perkins <lperkins@linuxfoundation.org>"
|
||||||
|
|
4
Makefile
4
Makefile
|
@ -6,8 +6,8 @@ NETLIFY_FUNC = $(NODE_BIN)/netlify-lambda
|
||||||
# but this can be overridden when calling make, e.g.
|
# but this can be overridden when calling make, e.g.
|
||||||
# CONTAINER_ENGINE=podman make container-image
|
# CONTAINER_ENGINE=podman make container-image
|
||||||
CONTAINER_ENGINE ?= docker
|
CONTAINER_ENGINE ?= docker
|
||||||
DOCKERFILE_VERSION = $(shell grep DOCKERFILE_VERSION Dockerfile | tail -n 1 | cut -d '=' -f 2 | tr -d " \"\n")
|
IMAGE_VERSION=$(shell scripts/hash-files.sh Dockerfile Makefile | cut -c 1-12)
|
||||||
CONTAINER_IMAGE = kubernetes-hugo:v$(HUGO_VERSION)-$(DOCKERFILE_VERSION)
|
CONTAINER_IMAGE = kubernetes-hugo:v$(HUGO_VERSION)-$(IMAGE_VERSION)
|
||||||
CONTAINER_RUN = $(CONTAINER_ENGINE) run --rm --interactive --tty --volume $(CURDIR):/src
|
CONTAINER_RUN = $(CONTAINER_ENGINE) run --rm --interactive --tty --volume $(CURDIR):/src
|
||||||
|
|
||||||
CCRED=\033[0;31m
|
CCRED=\033[0;31m
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
#!/bin/sh
|
||||||
|
# this script emits as hash for the files listed in $@
|
||||||
|
if command -v shasum >/dev/null 2>&1; then
|
||||||
|
cat "$@" | shasum -a 256 | cut -d' ' -f1
|
||||||
|
elif command -v sha256sum >/dev/null 2>&1; then
|
||||||
|
cat "$@" | sha256sum | cut -d' ' -f1
|
||||||
|
else
|
||||||
|
echo "missing shasum tool" 1>&2
|
||||||
|
exit 1
|
||||||
|
fi
|
Loading…
Reference in New Issue