Skip to content

Commit

Permalink
chore(tooling): Fixup Docker Hub sync
Browse files Browse the repository at this point in the history
  • Loading branch information
alerque committed Jun 10, 2024
1 parent a361f46 commit c0a5e33
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
16 changes: 9 additions & 7 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,15 @@ CLEANFILES = $(MANUAL)

DISTCLEANFILES = @AMINCLUDE@

# The boilerplate Docker is setup as if GHCR was our primary, and the CI jobs also
# manually override these values. But as long as we're manually running a sync of
# the auto deployed GHCR emiages to Dokcer Hub, the manual invocations need extra help.
export GHCR_REGISTRY ?= ghcr.io
export GHCR_REPO ?= sile-typesetter/$(TRANSFORMED_PACKAGE_NAME)
export DOCKER_REGISTRY ?= docker.io
export DOCKER_REPO ?= siletypesetter/$(TRANSFORMED_PACKAGE_NAME)
export DOCKER_TAG ?= HEAD

# A classical use of the autoconf-archive include macro would expand
# INC_AMINCLUDE here, but the perl script that inlines include statements
# runs before the automake that organizes logic and performs substitution.
Expand Down Expand Up @@ -392,13 +401,6 @@ $(DEPFILES): | $(DEPDIRS)

include $(wildcard $(DEPFILES))

export GHCR_REGISTRY ?= ghcr.io
export GHCR_REPO ?= sile-typesetter/$(TRANSFORMED_PACKAGE_NAME)

export DOCKER_REGISTRY ?= docker.io
export DOCKER_REPO ?= siletypesetter/$(TRANSFORMED_PACKAGE_NAME)
export DOCKER_TAG ?= HEAD

docker-dep-check: .docker_deps .aur_deps
$(DIFF) -u $^

Expand Down
2 changes: 1 addition & 1 deletion build-aux/que_docker_boilerplate.am
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ DOCKER_DEVELOPER_TARGETS = docker
.PHONY: $(DOCKER_DEVELOPER_TARGETS)

export DOCKER_REGISTRY ?= ghcr.io
export DOCKER_REPO ?= alerque/$(TRANSFORMED_PACKAGE_NAME)
export DOCKER_REPO ?= sile-typesetter/$(TRANSFORMED_PACKAGE_NAME)
export DOCKER_TAG ?= HEAD

docker: Dockerfile hooks/build .version
Expand Down

0 comments on commit c0a5e33

Please sign in to comment.