Skip to content

Commit c0a5e33

Browse files
committed
chore(tooling): Fixup Docker Hub sync
1 parent a361f46 commit c0a5e33

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

Makefile.am

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,15 @@ CLEANFILES = $(MANUAL)
8989

9090
DISTCLEANFILES = @AMINCLUDE@
9191

92+
# The boilerplate Docker is setup as if GHCR was our primary, and the CI jobs also
93+
# manually override these values. But as long as we're manually running a sync of
94+
# the auto deployed GHCR emiages to Dokcer Hub, the manual invocations need extra help.
95+
export GHCR_REGISTRY ?= ghcr.io
96+
export GHCR_REPO ?= sile-typesetter/$(TRANSFORMED_PACKAGE_NAME)
97+
export DOCKER_REGISTRY ?= docker.io
98+
export DOCKER_REPO ?= siletypesetter/$(TRANSFORMED_PACKAGE_NAME)
99+
export DOCKER_TAG ?= HEAD
100+
92101
# A classical use of the autoconf-archive include macro would expand
93102
# INC_AMINCLUDE here, but the perl script that inlines include statements
94103
# runs before the automake that organizes logic and performs substitution.
@@ -392,13 +401,6 @@ $(DEPFILES): | $(DEPDIRS)
392401

393402
include $(wildcard $(DEPFILES))
394403

395-
export GHCR_REGISTRY ?= ghcr.io
396-
export GHCR_REPO ?= sile-typesetter/$(TRANSFORMED_PACKAGE_NAME)
397-
398-
export DOCKER_REGISTRY ?= docker.io
399-
export DOCKER_REPO ?= siletypesetter/$(TRANSFORMED_PACKAGE_NAME)
400-
export DOCKER_TAG ?= HEAD
401-
402404
docker-dep-check: .docker_deps .aur_deps
403405
$(DIFF) -u $^
404406

build-aux/que_docker_boilerplate.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ DOCKER_DEVELOPER_TARGETS = docker
44
.PHONY: $(DOCKER_DEVELOPER_TARGETS)
55

66
export DOCKER_REGISTRY ?= ghcr.io
7-
export DOCKER_REPO ?= alerque/$(TRANSFORMED_PACKAGE_NAME)
7+
export DOCKER_REPO ?= sile-typesetter/$(TRANSFORMED_PACKAGE_NAME)
88
export DOCKER_TAG ?= HEAD
99

1010
docker: Dockerfile hooks/build .version

0 commit comments

Comments
 (0)