From 38725907f31a56a9619035f17d6ae1b0f9955a17 Mon Sep 17 00:00:00 2001 From: Hemna Date: Mon, 9 Jan 2023 11:54:50 -0500 Subject: [PATCH] Update Docker builds for 3.0.0 --- docker/Dockerfile | 6 ++++-- docker/build.sh | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index b0cec85..3b25080 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -6,7 +6,7 @@ FROM ubuntu:22.04 as aprsd ARG UID ARG GID ARG TZ -ARG VERSION=2.6.0 +ARG VERSION=3.0.0 ARG BUILDX_QEMU_ENV ENV APRS_USER=aprs ENV HOME=/home/aprs @@ -24,6 +24,8 @@ RUN apt install -y git build-essential RUN apt install -y libffi-dev python3-dev libssl-dev libxml2-dev libxslt-dev RUN apt install -y python3 python3-pip python3-dev python3-lxml +RUN pip3 install -U pip + RUN addgroup --gid $GID $APRS_USER RUN useradd -m -u $UID -g $APRS_USER $APRS_USER @@ -36,7 +38,7 @@ RUN if [ "${BUILDX_QEMU_ENV}" = "true" -a "$(getconf LONG_BIT)" = "32" ]; then \ fi # Install aprsd -RUN pip install aprsd==$APRSD_PIP_VERSION +RUN pip3 install aprsd==$APRSD_PIP_VERSION # Ensure /config is there with a default config file USER root diff --git a/docker/build.sh b/docker/build.sh index 5cc3f9c..134d736 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -25,7 +25,7 @@ DEV=0 REBUILD_BUILDX=0 TAG="latest" BRANCH=${BRANCH:-master} -VERSION="2.6.0" +VERSION="3.0.0" while getopts “hdart:b:v:” OPTION do