Skip to content

Commit

Permalink
Merge pull request #396 from felddy/issue/395
Browse files Browse the repository at this point in the history
Switch from cross-compilation to QEMU-based emulation builds
  • Loading branch information
felddy authored Dec 30, 2024
2 parents 4df0041 + 5f503da commit 7d4b6ed
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 10 deletions.
7 changes: 1 addition & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,9 @@ ARG PYTHON_VERSION=3.13.0
ARG WEEWX_UID=1000
ARG WEEWX_HOME="/home/weewx"

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

FROM --platform=$BUILDPLATFORM python:${PYTHON_VERSION} AS build-stage

COPY --from=xx / /
RUN apt-get update && apt-get install -y clang lld
ARG TARGETPLATFORM
RUN xx-apt install -y libc6-dev

WORKDIR /tmp
RUN \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ name: "weewx"

services:
weewx:
image: felddy/weewx:5.1.0
image: felddy/weewx:5
volumes:
- type: bind
source: ./data
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ volumes:

services:
weewx:
image: felddy/weewx:5.1.0
image: felddy/weewx:5
# devices:
# - "/dev/ttyUSB0:/dev/ttyUSB0"
volumes:
Expand Down
2 changes: 1 addition & 1 deletion src/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "5.1.0"
__version__ = "5.1.0+r1"
2 changes: 1 addition & 1 deletion src/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ CONF_FILE="${WEEWX_ROOT}/weewx.conf"

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

Expand Down

0 comments on commit 7d4b6ed

Please sign in to comment.