Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Configurable traefik and ddns tags #1458

Merged
merged 1 commit into from
Jul 31, 2023
+11 −4
Merged

Configurable traefik and ddns tags #1458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions default.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,5 +238,9 @@ DEPCLI_SRC_BUILD_TARGET='$(git describe --tags $(git rev-list --tags --max-count
# Does not (yet?) exist on Docker hub
DEPCLI_DOCKER_TAG=nonesuch

# traefik and cf-ddns
TRAEFIK_TAG=v2.10
DDNS_TAG=3

# For the Node Dashboard, define a regex of mount points to ignore for the diskspace check.
NODE_EXPORTER_IGNORE_MOUNT_REGEX='^/(dev|proc|sys|run|var/lib/docker/.+)($|/)'
2 changes: 1 addition & 1 deletion ethd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ envmigrate() {
TEKU_DOCKERFILE LH_SRC_BUILD_TARGET LH_DOCKER_TAG LH_DOCKERFILE PRYSM_SRC_BUILD_TARGET \
PRYSM_DOCKER_TAG PRYSM_DOCKER_VC_TAG PRYSM_DOCKERFILE ERIGON_SRC_BUILD_TARGET ERIGON_DOCKER_TAG \
ERIGON_DOCKERFILE MEV_DOCKERFILE MEV_DOCKER_TAG NIMEL_SRC_BUILD_TARGET NIMEL_DOCKER_TAG NIMEL_DOCKERFILE \
LS_SRC_BUILD_TARGET LS_DOCKER_TAG LS_DOCKERFILE GETH_SRC_BUILD_TARGET GETH_DOCKER_TAG \
LS_SRC_BUILD_TARGET LS_DOCKER_TAG LS_DOCKERFILE GETH_SRC_BUILD_TARGET GETH_DOCKER_TAG TRAEFIK_TAG DDNS_TAG \
GETH_DOCKERFILE NM_SRC_BUILD_TARGET NM_DOCKER_TAG NM_DOCKERFILE BESU_SRC_BUILD_TARGET \
BESU_DOCKER_TAG BESU_DOCKERFILE SSV2_NODE_TAG DEPCLI_SRC_BUILD_TARGET DEPCLI_DOCKER_TAG W3S_DOCKER_TAG \
PG_DOCKER_TAG RETH_SRC_BUILD_TARGET RETH_DOCKER_TAG RETH_DOCKERFILE NODE_EXPORTER_IGNORE_MOUNT_REGEX )
Expand Down
2 changes: 2 additions & 0 deletions traefik-aws.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ services:
image: traefik-aws
build:
context: ./traefik
args:
- DOCKER_TAG=${TRAEFIK_TAG}
restart: "unless-stopped"
command:
# - --accesslog=true
Expand Down
4 changes: 2 additions & 2 deletions traefik-cf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ x-logging: &logging

services:
traefik:
image: traefik:v2.10
image: traefik:${TRAEFIK_TAG}
restart: "unless-stopped"
command:
# - --accesslog=true
Expand Down Expand Up @@ -47,7 +47,7 @@ services:
<<: *logging

cf-ddns:
image: ghcr.io/joshuaavalon/cloudflare-ddns:3
image: ghcr.io/joshuaavalon/cloudflare-ddns:${DDNS_TAG}
restart: "unless-stopped"
environment:
- CF_DNS__LOG_LEVEL=${LOG_LEVEL:-info}
Expand Down
3 changes: 2 additions & 1 deletion traefik/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Add AWS CLI to traefik image
ARG DOCKER_TAG

FROM traefik:v2.10
FROM traefik:${DOCKER_TAG}

RUN apk add --no-cache \
python3 \
Expand Down