Skip to content

Commit 7d4b6ed

Browse files
authored
Merge pull request #396 from felddy/issue/395
Switch from cross-compilation to QEMU-based emulation builds
2 parents 4df0041 + 5f503da commit 7d4b6ed

File tree

5 files changed

+5
-10
lines changed

5 files changed

+5
-10
lines changed

Dockerfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,9 @@ ARG PYTHON_VERSION=3.13.0
44
ARG WEEWX_UID=1000
55
ARG WEEWX_HOME="/home/weewx"
66

7-
FROM --platform=$BUILDPLATFORM tonistiigi/xx AS xx
7+
FROM python:${PYTHON_VERSION} AS build-stage
88

9-
FROM --platform=$BUILDPLATFORM python:${PYTHON_VERSION} AS build-stage
10-
11-
COPY --from=xx / /
129
RUN apt-get update && apt-get install -y clang lld
13-
ARG TARGETPLATFORM
14-
RUN xx-apt install -y libc6-dev
1510

1611
WORKDIR /tmp
1712
RUN \

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ name: "weewx"
2828

2929
services:
3030
weewx:
31-
image: felddy/weewx:5.1.0
31+
image: felddy/weewx:5
3232
volumes:
3333
- type: bind
3434
source: ./data

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ volumes:
66

77
services:
88
weewx:
9-
image: felddy/weewx:5.1.0
9+
image: felddy/weewx:5
1010
# devices:
1111
# - "/dev/ttyUSB0:/dev/ttyUSB0"
1212
volumes:

src/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "5.1.0"
1+
__version__ = "5.1.0+r1"

src/entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ CONF_FILE="${WEEWX_ROOT}/weewx.conf"
99

1010
# echo version
1111
if [ $# -gt 0 ] && [ "$1" = "--version" ]; then
12-
weewxd --version
12+
python -c "import _version; print(_version.__version__)"
1313
exit 0
1414
fi
1515

0 commit comments

Comments
 (0)