From bbf30b5ef977a0b419d8c3e45687354a21157771 Mon Sep 17 00:00:00 2001
From: Michael Lynch <git@mtlynch.io>
Date: Wed, 16 Nov 2022 08:33:27 -0500
Subject: [PATCH 1/3] Add copyright file to Debian package

---
 Dockerfile | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 7fb2ff8..022b4a5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,6 +46,13 @@ RUN cp \
     --no-dereference \
     /usr/lib/arm-linux-gnueabihf/libnice.so* "${PKG_DIR}/"
 
+# Add copyright file.
+WORKDIR "${PKG_DIR}"
+RUN mkdir -p "usr/share/doc/${PKG_NAME}"
+COPY /usr/src/libnice/COPYING "usr/share/doc/${PKG_NAME}/copyright"
+COPY /usr/src/libnice/COPYING.LGPL "usr/share/doc/${PKG_NAME}/COPYING.LGPL"
+COPY /usr/src/libnice/COPYING.MPL "usr/share/doc/${PKG_NAME}/COPYING.MPL"
+
 WORKDIR "${PKG_DIR}/DEBIAN"
 
 RUN cat > control <<EOF

From 43413fbbcfffb29b0d197feceb908e92218b9687 Mon Sep 17 00:00:00 2001
From: Michael Lynch <git@mtlynch.io>
Date: Wed, 16 Nov 2022 08:37:01 -0500
Subject: [PATCH 2/3] Reorder build args

---
 Dockerfile | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 022b4a5..66cfc1d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,13 @@
 
 FROM debian:buster-20220418-slim AS build
 
+ARG PKG_NAME="libnice10"
+ARG PKG_VERSION="0.0.0"
+ARG PKG_BUILD_NUMBER="1"
+ARG PKG_ARCH="armhf"
+ARG PKG_ID="${PKG_NAME}_${PKG_VERSION}-${PKG_BUILD_NUMBER}_${PKG_ARCH}"
+ARG PKG_DIR="/releases/${PKG_ID}"
+
 RUN set -x && \
     apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -20,8 +27,6 @@ RUN set -x && \
 
 RUN pip3 install meson
 
-ARG PKG_VERSION="0.0.0"
-
 RUN mkdir -p "/usr/src/libnice"
 WORKDIR "/usr/src/libnice"
 RUN git clone https://gitlab.freedesktop.org/libnice/libnice \
@@ -32,12 +37,6 @@ RUN git clone https://gitlab.freedesktop.org/libnice/libnice \
     ninja -C build && \
     ninja -C build install
 
-ARG PKG_NAME="libnice10"
-ARG PKG_BUILD_NUMBER="1"
-ARG PKG_ARCH="armhf"
-ARG PKG_ID="${PKG_NAME}_${PKG_VERSION}-${PKG_BUILD_NUMBER}_${PKG_ARCH}"
-ARG PKG_DIR="/releases/${PKG_ID}"
-
 RUN mkdir --parents "${PKG_DIR}"
 
 # Copy compiled shared library into Debian package.

From 7f910f0bcd10c5ec3c0c49146575be2d5c96a9e6 Mon Sep 17 00:00:00 2001
From: Michael Lynch <git@mtlynch.io>
Date: Wed, 16 Nov 2022 09:13:15 -0500
Subject: [PATCH 3/3] Fix copy commands to happen within container

---
 Dockerfile | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 66cfc1d..c0b1dcd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,13 +4,6 @@
 
 FROM debian:buster-20220418-slim AS build
 
-ARG PKG_NAME="libnice10"
-ARG PKG_VERSION="0.0.0"
-ARG PKG_BUILD_NUMBER="1"
-ARG PKG_ARCH="armhf"
-ARG PKG_ID="${PKG_NAME}_${PKG_VERSION}-${PKG_BUILD_NUMBER}_${PKG_ARCH}"
-ARG PKG_DIR="/releases/${PKG_ID}"
-
 RUN set -x && \
     apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -27,6 +20,8 @@ RUN set -x && \
 
 RUN pip3 install meson
 
+ARG PKG_VERSION="0.0.0"
+
 RUN mkdir -p "/usr/src/libnice"
 WORKDIR "/usr/src/libnice"
 RUN git clone https://gitlab.freedesktop.org/libnice/libnice \
@@ -37,6 +32,12 @@ RUN git clone https://gitlab.freedesktop.org/libnice/libnice \
     ninja -C build && \
     ninja -C build install
 
+ARG PKG_NAME="libnice10"
+ARG PKG_BUILD_NUMBER="1"
+ARG PKG_ARCH="armhf"
+ARG PKG_ID="${PKG_NAME}_${PKG_VERSION}-${PKG_BUILD_NUMBER}_${PKG_ARCH}"
+ARG PKG_DIR="/releases/${PKG_ID}"
+
 RUN mkdir --parents "${PKG_DIR}"
 
 # Copy compiled shared library into Debian package.
@@ -46,11 +47,11 @@ RUN cp \
     /usr/lib/arm-linux-gnueabihf/libnice.so* "${PKG_DIR}/"
 
 # Add copyright file.
-WORKDIR "${PKG_DIR}"
-RUN mkdir -p "usr/share/doc/${PKG_NAME}"
-COPY /usr/src/libnice/COPYING "usr/share/doc/${PKG_NAME}/copyright"
-COPY /usr/src/libnice/COPYING.LGPL "usr/share/doc/${PKG_NAME}/COPYING.LGPL"
-COPY /usr/src/libnice/COPYING.MPL "usr/share/doc/${PKG_NAME}/COPYING.MPL"
+RUN mkdir -p "${PKG_DIR}/usr/share/doc/${PKG_NAME}"
+WORKDIR "${PKG_DIR}/usr/share/doc/${PKG_NAME}"
+RUN cp /usr/src/libnice/COPYING copyright && \
+    cp /usr/src/libnice/COPYING.LGPL . && \
+    cp /usr/src/libnice/COPYING.MPL .
 
 WORKDIR "${PKG_DIR}/DEBIAN"