Skip to content

Commit 552a286

Browse files
authored
Fix address extracting bug. Update modern Docker image (#47)
1 parent 1471b6c commit 552a286

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ BUILDX_ARGS := --builder multiarch \
1919

2020

2121
MODERN_BUILDX_ARGS = \
22-
--build-arg RUST_BUILDER_BASE=rust:1-bookworm \
23-
--build-arg GO_BUILDER_BASE=golang:1.24-bookworm \
22+
--build-arg RUST_BUILDER_BASE=rust:1-trixie \
23+
--build-arg GO_BUILDER_BASE=golang:1.24-trixie \
2424
--build-arg FINAL_BASE=ubuntu:25.04 \
25-
--build-arg GCC_VERSION=12
25+
--build-arg GCC_VERSION=14
2626

2727
.PHONY: all build build-local build-modern build-local-modern clean prepare check-version
2828

scripts/_lib.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ wg_update_endpoint() {
6464
conf="${WORKDIR}/${iface}.conf"
6565
test -e "${conf}" || { echo "Could not find config ${conf}"; return 1; }
6666

67-
sed -i "s/^Endpoint\s*=.*$/Endpoint = ${endpoint}/g" "${conf}"
67+
sed -i "s/^Endpoint[ ]*=.*$/Endpoint = ${endpoint}/g" "${conf}"
6868
}
6969

7070
wg_get_latest_handshake() {
@@ -82,12 +82,12 @@ wg_get_latest_handshake() {
8282

8383
wg_get_endpoint() {
8484
iface="$1"
85-
get_addr_from_conf "${iface}" "^Endpoint\s*=\s*"
85+
get_addr_from_conf "${iface}" "^Endpoint[ ]*=[ ]*"
8686
}
8787

8888
wg_get_addr() {
8989
iface="$1"
90-
get_addr_from_conf "${iface}" "^Address\s*=\s*"
90+
get_addr_from_conf "${iface}" "^Address[ ]*=[ ]*"
9191
}
9292

9393
get_addr_from_conf() {

0 commit comments

Comments
 (0)