build(docker): fix COPY placement and apt package name for geographiclib; run build scripts outside RUN copy (Dockerfile syntax)\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
1 parent
c028a5622c
commit
3a4f72d59f
1 file changed
+3
-3
+3
-3
@@ -60,6 +60,8 @@ RUN python3 -m venv /opt/venv \
|
|||||||
|
|
||||||
# Build and install Log4Qt via script in /app (keeps Dockerfile small)
|
# Build and install Log4Qt via script in /app (keeps Dockerfile small)
|
||||||
COPY build_log4qt.sh /app/build_log4qt.sh
|
COPY build_log4qt.sh /app/build_log4qt.sh
|
||||||
|
COPY build_grantlee.sh /app/build_grantlee.sh
|
||||||
|
COPY build_kdreports.sh /app/build_kdreports.sh
|
||||||
RUN /app/build_log4qt.sh
|
RUN /app/build_log4qt.sh
|
||||||
|
|
||||||
|
|
||||||
@@ -68,7 +70,7 @@ RUN /app/build_log4qt.sh
|
|||||||
RUN set -eux; \
|
RUN set -eux; \
|
||||||
apt-get update; \
|
apt-get update; \
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
libgeographic-dev \
|
libgeographiclib-dev \
|
||||||
libssl-dev \
|
libssl-dev \
|
||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
libicu-dev \
|
libicu-dev \
|
||||||
@@ -77,8 +79,6 @@ RUN set -eux; \
|
|||||||
# Try to install Grantlee / KDReports via apt (preferred); ignore failures
|
# Try to install Grantlee / KDReports via apt (preferred); ignore failures
|
||||||
apt-get install -y --no-install-recommends libgrantlee5 libgrantlee5-dev libkdreports-dev || true; \
|
apt-get install -y --no-install-recommends libgrantlee5 libgrantlee5-dev libkdreports-dev || true; \
|
||||||
# Build Grantlee and KDReports via scripts in /app if apt packages not available
|
# Build Grantlee and KDReports via scripts in /app if apt packages not available
|
||||||
COPY build_grantlee.sh /app/build_grantlee.sh; \
|
|
||||||
COPY build_kdreports.sh /app/build_kdreports.sh; \
|
|
||||||
/app/build_grantlee.sh || true; \
|
/app/build_grantlee.sh || true; \
|
||||||
/app/build_kdreports.sh || true; \
|
/app/build_kdreports.sh || true; \
|
||||||
# geographiclib already installed via apt; RTI (Proprietary) cannot be installed automatically
|
# geographiclib already installed via apt; RTI (Proprietary) cannot be installed automatically
|
||||||
|
|||||||
Reference in new issue
Block a user