File tree Expand file tree Collapse file tree 2 files changed +10
-8
lines changed Expand file tree Collapse file tree 2 files changed +10
-8
lines changed Original file line number Diff line number Diff line change @@ -89,6 +89,15 @@ CLEANFILES = $(MANUAL)
89
89
90
90
DISTCLEANFILES = @AMINCLUDE@
91
91
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
+
92
101
# A classical use of the autoconf-archive include macro would expand
93
102
# INC_AMINCLUDE here, but the perl script that inlines include statements
94
103
# runs before the automake that organizes logic and performs substitution.
@@ -392,13 +401,6 @@ $(DEPFILES): | $(DEPDIRS)
392
401
393
402
include $(wildcard $(DEPFILES ) )
394
403
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
-
402
404
docker-dep-check : .docker_deps .aur_deps
403
405
$(DIFF ) -u $^
404
406
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ DOCKER_DEVELOPER_TARGETS = docker
4
4
.PHONY: $(DOCKER_DEVELOPER_TARGETS)
5
5
6
6
export DOCKER_REGISTRY ?= ghcr.io
7
- export DOCKER_REPO ?= alerque /$(TRANSFORMED_PACKAGE_NAME)
7
+ export DOCKER_REPO ?= sile-typesetter /$(TRANSFORMED_PACKAGE_NAME)
8
8
export DOCKER_TAG ?= HEAD
9
9
10
10
docker: Dockerfile hooks/build .version
You can’t perform that action at this time.
0 commit comments