scottk/nDPId
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/nDPId.git synced 2025-10-29 17:32:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dockerfile update

Browse Source 
* gitlab-ci runner fix (single runner / multiple jobs)

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
Toni Uhlig
2024-11-18 14:44:44 +01:00
parent 0a4f3cb0c8
commit 442900bc14
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -4,7 +4,7 @@ stages:
- build_and_test - build_and_test
variables: variables:
GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/$CI_PROJECT_PATH GIT_CLONE_PATH: '$CI_BUILDS_DIR/$CI_JOB_ID/$CI_PROJECT_NAME'
before_script: before_script:
- export DEBIAN_FRONTEND=noninteractive - export DEBIAN_FRONTEND=noninteractive

19
Dockerfile
View File

@@ -1,13 +1,16 @@
FROM ubuntu:22.04 AS builder FROM ubuntu:22.04 AS builder
WORKDIR /root WORKDIR /root
RUN apt-get -y update && apt-get install -y --no-install-recommends \ RUN apt-get -y update \
&& apt-get install -y --no-install-recommends \
autoconf automake build-essential ca-certificates cmake git \ autoconf automake build-essential ca-certificates cmake git \
libpcap-dev libtool make pkg-config unzip wget && apt-get clean libpcap-dev libtool make pkg-config unzip wget \
RUN git clone https://github.com/utoni/nDPId.git && apt-get clean \
&& git clone https://github.com/utoni/nDPId.git
WORKDIR /root/nDPId WORKDIR /root/nDPId
RUN cmake -S . -B build -DBUILD_NDPI=ON && cmake --build build --verbose RUN cmake -S . -B build -DBUILD_NDPI=ON \
&& cmake --build build --verbose
FROM ubuntu:22.04 FROM ubuntu:22.04
USER root USER root
@@ -16,8 +19,10 @@ WORKDIR /
COPY --from=builder /root/nDPId/build/nDPId /usr/sbin/nDPId COPY --from=builder /root/nDPId/build/nDPId /usr/sbin/nDPId
COPY --from=builder /root/nDPId/build/nDPIsrvd /usr/bin/nDPIsrvd COPY --from=builder /root/nDPId/build/nDPIsrvd /usr/bin/nDPIsrvd
RUN apt-get -y update && apt-get install -y --no-install-recommends libpcap-dev && apt-get clean RUN apt-get -y update \
&& apt-get install -y --no-install-recommends libpcap-dev \
&& apt-get clean
USER nobody USER nobody
RUN /usr/bin/nDPIsrvd -h || { RC=$?; test ${RC} -eq 1; } RUN /usr/bin/nDPIsrvd -h || { RC=$?; test ${RC} -eq 1; }; \
RUN /usr/sbin/nDPId -h || { RC=$?; test ${RC} -eq 1; } /usr/sbin/nDPId -h || { RC=$?; test ${RC} -eq 1; }