Compare commits
2 Commits
4ef4bbd4ad
...
f537b99d02
| Author | SHA1 | Date | |
|---|---|---|---|
| f537b99d02 | |||
| ad4b03871e |
+3
-3
@@ -1,6 +1,6 @@
|
|||||||
FROM git.joeac.net/joeac/armv7/agate:3.3.20-alpine3.23 AS agate
|
FROM git.joeac.net/joeac/${IMAGE_PREFIX}agate:3.3.20-alpine3.23 AS agate
|
||||||
FROM git.joeac.net/joeac/armv7/comitium:1.8.2-alpine3.23 AS comitium
|
FROM git.joeac.net/joeac/${IMAGE_PREFIX}comitium:1.8.2-alpine3.23 AS comitium
|
||||||
FROM git.joeac.net/joeac/armv7/crond:1.37.0-r30-alpine3.23 AS final
|
FROM git.joeac.net/joeac/${IMAGE_PREFIX}crond:1.37.0-r30-alpine3.23 AS final
|
||||||
RUN apk --no-cache add gcc # dependency for agate
|
RUN apk --no-cache add gcc # dependency for agate
|
||||||
COPY --from=agate /root/.cargo/bin/agate /usr/local/bin/agate
|
COPY --from=agate /root/.cargo/bin/agate /usr/local/bin/agate
|
||||||
COPY --from=comitium /usr/local/bin/comitium /usr/local/bin/comitium
|
COPY --from=comitium /usr/local/bin/comitium /usr/local/bin/comitium
|
||||||
|
|||||||
@@ -1,7 +1,3 @@
|
|||||||
CPU_ARCH := $(if $(shell which arch 2>/dev/null),\
|
|
||||||
$(shell arch),\
|
|
||||||
$(shell lscpu | grep ^Architecture: | sed "s/^Architecture:[[:space:]]*\([[:alnum:][:punct:]]\+\).*/\1/"))
|
|
||||||
IMAGE_PREFIX := $(if $(filter armv7%,$(CPU_ARCH)),armv7/)
|
|
||||||
REGISTRY_DOMAIN := git.joeac.net
|
REGISTRY_DOMAIN := git.joeac.net
|
||||||
REGISTRY_USER := joeac
|
REGISTRY_USER := joeac
|
||||||
|
|
||||||
|
|||||||
@@ -55,6 +55,10 @@ INSTALL_RULES := $(foreach module,$(MODULES),install_$(module))
|
|||||||
REINSTALL_RULES := $(foreach module,$(MODULES),reinstall_$(module))
|
REINSTALL_RULES := $(foreach module,$(MODULES),reinstall_$(module))
|
||||||
UNINSTALL_RULES := $(foreach module,$(MODULES),uninstall_$(module))
|
UNINSTALL_RULES := $(foreach module,$(MODULES),uninstall_$(module))
|
||||||
|
|
||||||
|
CPU_ARCH := $(if $(shell which arch 2>/dev/null),\
|
||||||
|
$(shell arch),\
|
||||||
|
$(shell lscpu | grep ^Architecture: | sed "s/^Architecture:[[:space:]]*\([[:alnum:][:punct:]]\+\).*/\1/"))
|
||||||
|
IMAGE_PREFIX := $(if $(filter armv7%,$(CPU_ARCH)),armv7/)
|
||||||
COMPOSE_CMD := \
|
COMPOSE_CMD := \
|
||||||
ALPINE_VERSION="$(ALPINE_VERSION)" \
|
ALPINE_VERSION="$(ALPINE_VERSION)" \
|
||||||
IMAGE_PREFIX="$(IMAGE_PREFIX)" \
|
IMAGE_PREFIX="$(IMAGE_PREFIX)" \
|
||||||
|
|||||||
Reference in New Issue
Block a user