Skip to content

Commit a493924

Browse files
committed
Fix Docker build permissions for tests
Add xml-core as build dependency
1 parent 5b495bc commit a493924

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

‎debian/control‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Section: utils
33
Priority: optional
44
Maintainer: Luke Ian Turner <turnertech@outlook.de>
55
Standards-Version: 4.7.2
6-
Build-Depends: debhelper-compat (= 13), libexiv2-dev, libargparse-dev, libxml2-dev (>= 2.12.7), libgtest-dev, doxygen, help2man
6+
Build-Depends: debhelper-compat (= 13), libexiv2-dev, libargparse-dev, libxml2-dev (>= 2.12.7), libgtest-dev, doxygen, help2man, xml-core
77
Vcs-Git: https://github.com/liturner/nmbs.git
88
Vcs-Browser: https://github.com/liturner/nmbs
99
Homepage: https://github.com/liturner/nmbs

‎docker/build.dockerfile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,18 @@ ARG DEBIAN_RELEASE=forky
22
FROM debian:${DEBIAN_RELEASE} AS nmbs-build
33

44
RUN apt-get update && apt-get install --no-install-recommends --yes \
5-
build-essential cmake debhelper help2man libgtest-dev doxygen libargparse-dev libexiv2-dev libxml2-dev pkg-config libglib2.0-dev libnautilus-extension-dev
5+
build-essential cmake debhelper help2man libgtest-dev doxygen libargparse-dev libexiv2-dev libxml2-dev pkg-config libglib2.0-dev libnautilus-extension-dev xml-core && \
6+
useradd -ms /bin/bash nmbs
67

7-
WORKDIR /usr/src/nmbs/src
8-
COPY . .
8+
USER nmbs
9+
WORKDIR /home/nmbs/src/nmbs
10+
COPY --chown=nmbs:nmbs . .
911

1012
RUN dpkg-buildpackage
1113

1214

1315
FROM debian:trixie AS nmbs-trixie
14-
RUN --mount=type=bind,from=nmbs-build,source=/usr/src/nmbs,target=/tmp/nmbs \
16+
RUN --mount=type=bind,from=nmbs-build,source=/home/nmbs/src,target=/tmp/nmbs \
1517
apt-get update && \
1618
apt-get install --no-install-recommends --yes /tmp/nmbs/libnmbs1_1*.deb /tmp/nmbs/nmbs_1*.deb && \
1719
rm -rf /var/lib/apt/lists/* && \

0 commit comments

Comments
 (0)