Browse Source

added labels org.opencontainers.image.title, .source & .revision; added makefile to support image building & tagging

Fabian Peter Hammerle 3 years ago
parent
commit
f7360b84cf
3 changed files with 37 additions and 1 deletions
  1. 6 0
      Dockerfile
  2. 30 0
      Makefile
  3. 1 1
      docker-compose.yml

+ 6 - 0
Dockerfile

@@ -23,3 +23,9 @@ RUN apt-get update \
 USER browser
 #CMD ["brave-browser"] podman
 CMD ["brave-browser", "--no-sandbox"]
+
+# https://github.com/opencontainers/image-spec/blob/v1.0.1/annotations.md
+ARG REVISION=
+LABEL org.opencontainers.image.title="brave browser" \
+    org.opencontainers.image.source="https://github.com/fphammerle/docker-brave-browser" \
+    org.opencontainers.image.revision="$REVISION"

+ 30 - 0
Makefile

@@ -0,0 +1,30 @@
+# sync with https://github.com/fphammerle/docker-onion-service/blob/master/Makefile
+
+IMAGE_NAME = docker.io/fphammerle/brave-browser
+PROJECT_VERSION = $(shell git describe --match=v* --abbrev=0 --dirty | sed -e 's/^v//')
+BRAVE_BROWSER_PACKAGE_VERSION = $(shell grep -Po 'BRAVE_BROWSER_PACKAGE_VERSION=\K.+' Dockerfile | tr -d -)
+ARCH = $(shell arch)
+# currently brave only provides builds for amd64
+IMAGE_TAG_ARCH_x86_64 = amd64
+IMAGE_TAG_ARCH = ${IMAGE_TAG_ARCH_${ARCH}}
+IMAGE_TAG = ${PROJECT_VERSION}-browser${BRAVE_BROWSER_PACKAGE_VERSION}-${IMAGE_TAG_ARCH}
+BUILD_PARAMS = --tag="${IMAGE_NAME}:${IMAGE_TAG}" \
+	--build-arg=REVISION="$(shell git rev-parse HEAD)"
+
+.PHONY: worktree-clean docker-build podman-build docker-push
+
+worktree-clean:
+	git diff --exit-code
+	git diff --staged --exit-code
+
+docker-build: worktree-clean
+	sudo docker build ${BUILD_PARAMS} .
+
+podman-build: worktree-clean
+	# --format=oci (default) not fully supported by hub.docker.com
+	# https://github.com/docker/hub-feedback/issues/1871#issuecomment-748924149
+	podman build --format=docker ${BUILD_PARAMS} .
+
+docker-push: docker-build
+	sudo docker push "${IMAGE_NAME}:${IMAGE_TAG}"
+	@echo git tag --sign --message '$(shell sudo docker image inspect --format '{{join .RepoDigests "\n"}}' "${IMAGE_NAME}:${IMAGE_TAG}")' docker/${IMAGE_TAG} $(shell git rev-parse HEAD)

+ 1 - 1
docker-compose.yml

@@ -6,7 +6,7 @@ version: '2'
 services:
   browser:
     build: .
-    image: fphammerle/brave-browser-x11
+    image: docker.io/fphammerle/brave-browser-x11
     environment:
     - DISPLAY
     volumes: