Redesign Dockerfile and add .dockerignore
Refs: #5303
Change-Id: I494c2b64cf7230225e45a1028ee69f50612ffffa
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..3c7f02d
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,27 @@
+# Waf build system
+build/
+.waf-*-*/
+.waf3-*-*/
+.lock-waf*
+
+# Compiled python code
+**/__pycache__/
+**/*.py[cod]
+
+# Qt Creator
+*.creator
+*.creator.user
+.qtc_clangd/
+
+# Visual Studio Code
+.vscode/
+
+# macOS
+**/.DS_Store
+**/.AppleDouble
+**/.LSOverride
+**/._*
+
+# Other
+Dockerfile
+VERSION.info
diff --git a/.gitignore b/.gitignore
index 724f671..9357dcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,20 @@
-# Emacs
+# Backup files
*~
+*.bak
+*.orig
+*.rej
+
+# Waf build system
+/build/
+.waf-*-*/
+.waf3-*-*/
+.lock-waf*
+
+# Compiled python code
+__pycache__/
+*.py[cod]
+
+# Emacs
\#*\#
/.emacs.desktop
/.emacs.desktop.lock
@@ -15,16 +30,6 @@
.LSOverride
._*
-# Waf build system
-/build/
-.waf-*-*/
-.waf3-*-*/
-.lock-waf*
-
-# Compiled python code
-__pycache__/
-*.py[cod]
-
# Other
/VERSION.info
/examples/example-trust-anchor.cert
diff --git a/Dockerfile b/Dockerfile
index 4a9b699..3287b1a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,25 +1,52 @@
-FROM gcc:12-bookworm
+# syntax=docker/dockerfile:1
-RUN apt-get update \
- && apt-get install -y --no-install-recommends \
+FROM ubuntu:23.10 AS build
+
+RUN apt-get install -Uy --no-install-recommends \
dpkg-dev \
+ g++ \
+ git \
libboost-chrono-dev \
- libboost-date-time-dev \
libboost-dev \
libboost-filesystem-dev \
- libboost-iostreams-dev \
libboost-log-dev \
libboost-program-options-dev \
libboost-stacktrace-dev \
libboost-thread-dev \
- pkg-config \
+ libsqlite3-dev \
+ libssl-dev \
+ pkgconf \
+ python3 \
+ # use 'apt-get distclean' when we upgrade to ubuntu:24.04
&& rm -rf /var/lib/apt/lists/*
-COPY . /ndn-cxx
+RUN --mount=type=bind,rw,target=/src <<EOF
+set -eux
+cd /src
+./waf configure \
+ --prefix=/usr \
+ --libdir=/usr/lib \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --sharedstatedir=/var \
+ --disable-static \
+ --enable-shared
+./waf build
+./waf install
-RUN cd /ndn-cxx \
- && ./waf configure --without-pch --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static --enable-shared \
- && ./waf \
- && ./waf install \
- && cd \
- && rm -rf /ndn-cxx
+mkdir -p /deps/debian
+touch /deps/debian/control
+cd /deps
+dpkg-shlibdeps --ignore-missing-info /usr/lib/libndn-cxx.so.* /usr/bin/ndnsec -O \
+ | sed -n 's|^shlibs:Depends=||p' | sed 's| ([^)]*),\?||g' > ndn-cxx
+EOF
+
+FROM ubuntu:23.10 AS run
+
+RUN --mount=type=bind,from=build,source=/deps,target=/deps \
+ apt-get install -Uy --no-install-recommends $(cat /deps/ndn-cxx) \
+ && rm -rf /var/lib/apt/lists/*
+
+RUN --mount=type=bind,from=build,source=/usr,target=/build \
+ cp -av /build/lib/libndn-cxx.so.* /usr/lib/ \
+ && cp -av /build/bin/ndnsec* /usr/bin/