[GHA] Migrate to new project layout.

signalwire · Sep 23, 2024 · e48c794 · e48c794
1 parent 64824ee
commit e48c794
Show file tree

Hide file tree

Showing 28 changed files with 1,430 additions and 234 deletions.
diff --git a/...b/docker/debian/bookworm/amd64/Dockerfile → ...ian/bookworm/amd64/fsa.release.Dockerfile b/...b/docker/debian/bookworm/amd64/Dockerfile → ...ian/bookworm/amd64/fsa.release.Dockerfile
@@ -1,18 +1,26 @@
-ARG BUILDER_IMAGE=debian:bookworm
-ARG MAINTAINER="Andrey Volk <[email protected]>"
+ARG BUILDER_IMAGE=debian:bookworm-20240513
 
 FROM ${BUILDER_IMAGE} AS builder
 
+ARG MAINTAINER_NAME="Andrey Volk"
+ARG MAINTAINER_EMAIL="[email protected]"
+
 ARG BUILD_NUMBER=42
 ARG GIT_SHA=0000000000
 
-MAINTAINER ${MAINTAINER}
+ARG DATA_DIR=/data
+
+LABEL maintainer="${MAINTAINER_NAME} <${MAINTAINER_EMAIL}>"
 
 SHELL ["/bin/bash", "-c"]
 
-RUN apt-get -q update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -yq install \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get -q update \
+    && apt-get -y -q install \
         apt-transport-https \
+        autoconf \
+        automake \
         build-essential \
         ca-certificates \
         cmake \
@@ -22,6 +30,7 @@ RUN apt-get -q update && \
         dh-autoreconf \
         dos2unix \
         doxygen \
+        dpkg-dev \
         git \
         graphviz \
         libglib2.0-dev \
@@ -32,19 +41,20 @@ RUN apt-get -q update && \
 
 RUN update-ca-certificates --fresh
 
-ENV DATA_DIR=/data
-WORKDIR ${DATA_DIR}
+RUN git config --global --add safe.directory '*' \
+    && git config --global user.name "${MAINTAINER_NAME}" \
+    && git config --global user.email "${MAINTAINER_EMAIL}"
 
+# Bootstrap and Build
 COPY . ${DATA_DIR}
-RUN git reset --hard HEAD && git clean -xfd
-
-RUN git config --global --add safe.directory '*'
+WORKDIR ${DATA_DIR}
 
-# Bootstrap and Build
 RUN PACKAGE_RELEASE="${BUILD_NUMBER}.${GIT_SHA}" cmake . \
-    -DCMAKE_BUILD_TYPE=Debug \
-    -DCMAKE_INSTALL_PREFIX="/usr" && \
-    make package && mkdir OUT && mv -v *.deb OUT/.
+        -DCMAKE_BUILD_TYPE=Debug \
+        -DCMAKE_INSTALL_PREFIX="/usr" \
+    && make package \
+    && mkdir OUT \
+    && mv -v *.deb OUT/.
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch

diff --git a/...docker/debian/bookworm/arm32v7/Dockerfile → ...an/bookworm/amd64/fsa.unstable.Dockerfile b/...docker/debian/bookworm/arm32v7/Dockerfile → ...an/bookworm/amd64/fsa.unstable.Dockerfile
@@ -1,18 +1,26 @@
-ARG BUILDER_IMAGE=arm32v7/debian:bookworm
-ARG MAINTAINER="Andrey Volk <[email protected]>"
+ARG BUILDER_IMAGE=debian:bookworm-20240513
 
 FROM ${BUILDER_IMAGE} AS builder
 
+ARG MAINTAINER_NAME="Andrey Volk"
+ARG MAINTAINER_EMAIL="[email protected]"
+
 ARG BUILD_NUMBER=42
 ARG GIT_SHA=0000000000
 
-MAINTAINER ${MAINTAINER}
+ARG DATA_DIR=/data
+
+LABEL maintainer="${MAINTAINER_NAME} <${MAINTAINER_EMAIL}>"
 
 SHELL ["/bin/bash", "-c"]
 
-RUN apt-get -q update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -yq install \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get -q update \
+    && apt-get -y -q install \
         apt-transport-https \
+        autoconf \
+        automake \
         build-essential \
         ca-certificates \
         cmake \
@@ -22,6 +30,7 @@ RUN apt-get -q update && \
         dh-autoreconf \
         dos2unix \
         doxygen \
+        dpkg-dev \
         git \
         graphviz \
         libglib2.0-dev \
@@ -32,19 +41,20 @@ RUN apt-get -q update && \
 
 RUN update-ca-certificates --fresh
 
-ENV DATA_DIR=/data
-WORKDIR ${DATA_DIR}
+RUN git config --global --add safe.directory '*' \
+    && git config --global user.name "${MAINTAINER_NAME}" \
+    && git config --global user.email "${MAINTAINER_EMAIL}"
 
+# Bootstrap and Build
 COPY . ${DATA_DIR}
-RUN git reset --hard HEAD && git clean -xfd
-
-RUN git config --global --add safe.directory '*'
+WORKDIR ${DATA_DIR}
 
-# Bootstrap and Build
 RUN PACKAGE_RELEASE="${BUILD_NUMBER}.${GIT_SHA}" cmake . \
-    -DCMAKE_BUILD_TYPE=Debug \
-    -DCMAKE_INSTALL_PREFIX="/usr" && \
-    make package && mkdir OUT && mv -v *.deb OUT/.
+        -DCMAKE_BUILD_TYPE=Debug \
+        -DCMAKE_INSTALL_PREFIX="/usr" \
+    && make package \
+    && mkdir OUT \
+    && mv -v *.deb OUT/.
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch

diff --git a/...docker/debian/bookworm/arm64v8/Dockerfile → .../bookworm/amd64/public.release.Dockerfile b/...docker/debian/bookworm/arm64v8/Dockerfile → .../bookworm/amd64/public.release.Dockerfile
@@ -1,18 +1,26 @@
-ARG BUILDER_IMAGE=arm64v8/debian:bookworm
-ARG MAINTAINER="Andrey Volk <[email protected]>"
+ARG BUILDER_IMAGE=debian:bookworm-20240513
 
 FROM ${BUILDER_IMAGE} AS builder
 
+ARG MAINTAINER_NAME="Andrey Volk"
+ARG MAINTAINER_EMAIL="[email protected]"
+
 ARG BUILD_NUMBER=42
 ARG GIT_SHA=0000000000
 
-MAINTAINER ${MAINTAINER}
+ARG DATA_DIR=/data
+
+LABEL maintainer="${MAINTAINER_NAME} <${MAINTAINER_EMAIL}>"
 
 SHELL ["/bin/bash", "-c"]
 
-RUN apt-get -q update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -yq install \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get -q update \
+    && apt-get -y -q install \
         apt-transport-https \
+        autoconf \
+        automake \
         build-essential \
         ca-certificates \
         cmake \
@@ -22,6 +30,7 @@ RUN apt-get -q update && \
         dh-autoreconf \
         dos2unix \
         doxygen \
+        dpkg-dev \
         git \
         graphviz \
         libglib2.0-dev \
@@ -32,19 +41,20 @@ RUN apt-get -q update && \
 
 RUN update-ca-certificates --fresh
 
-ENV DATA_DIR=/data
-WORKDIR ${DATA_DIR}
+RUN git config --global --add safe.directory '*' \
+    && git config --global user.name "${MAINTAINER_NAME}" \
+    && git config --global user.email "${MAINTAINER_EMAIL}"
 
+# Bootstrap and Build
 COPY . ${DATA_DIR}
-RUN git reset --hard HEAD && git clean -xfd
-
-RUN git config --global --add safe.directory '*'
+WORKDIR ${DATA_DIR}
 
-# Bootstrap and Build
 RUN PACKAGE_RELEASE="${BUILD_NUMBER}.${GIT_SHA}" cmake . \
-    -DCMAKE_BUILD_TYPE=Debug \
-    -DCMAKE_INSTALL_PREFIX="/usr" && \
-    make package && mkdir OUT && mv -v *.deb OUT/.
+        -DCMAKE_BUILD_TYPE=Debug \
+        -DCMAKE_INSTALL_PREFIX="/usr" \
+    && make package \
+    && mkdir OUT \
+    && mv -v *.deb OUT/.
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch

diff --git a/...b/docker/debian/bullseye/amd64/Dockerfile → ...bookworm/amd64/public.unstable.Dockerfile b/...b/docker/debian/bullseye/amd64/Dockerfile → ...bookworm/amd64/public.unstable.Dockerfile
@@ -1,18 +1,26 @@
-ARG BUILDER_IMAGE=debian:bullseye
-ARG MAINTAINER="Andrey Volk <[email protected]>"
+ARG BUILDER_IMAGE=debian:bookworm-20240513
 
 FROM ${BUILDER_IMAGE} AS builder
 
+ARG MAINTAINER_NAME="Andrey Volk"
+ARG MAINTAINER_EMAIL="[email protected]"
+
 ARG BUILD_NUMBER=42
 ARG GIT_SHA=0000000000
 
-MAINTAINER ${MAINTAINER}
+ARG DATA_DIR=/data
+
+LABEL maintainer="${MAINTAINER_NAME} <${MAINTAINER_EMAIL}>"
 
 SHELL ["/bin/bash", "-c"]
 
-RUN apt-get -q update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -yq install \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get -q update \
+    && apt-get -y -q install \
         apt-transport-https \
+        autoconf \
+        automake \
         build-essential \
         ca-certificates \
         cmake \
@@ -22,6 +30,7 @@ RUN apt-get -q update && \
         dh-autoreconf \
         dos2unix \
         doxygen \
+        dpkg-dev \
         git \
         graphviz \
         libglib2.0-dev \
@@ -32,19 +41,20 @@ RUN apt-get -q update && \
 
 RUN update-ca-certificates --fresh
 
-ENV DATA_DIR=/data
-WORKDIR ${DATA_DIR}
+RUN git config --global --add safe.directory '*' \
+    && git config --global user.name "${MAINTAINER_NAME}" \
+    && git config --global user.email "${MAINTAINER_EMAIL}"
 
+# Bootstrap and Build
 COPY . ${DATA_DIR}
-RUN git reset --hard HEAD && git clean -xfd
-
-RUN git config --global --add safe.directory '*'
+WORKDIR ${DATA_DIR}
 
-# Bootstrap and Build
 RUN PACKAGE_RELEASE="${BUILD_NUMBER}.${GIT_SHA}" cmake . \
-    -DCMAKE_BUILD_TYPE=Debug \
-    -DCMAKE_INSTALL_PREFIX="/usr" && \
-    make package && mkdir OUT && mv -v *.deb OUT/.
+        -DCMAKE_BUILD_TYPE=Debug \
+        -DCMAKE_INSTALL_PREFIX="/usr" \
+    && make package \
+    && mkdir OUT \
+    && mv -v *.deb OUT/.
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch

diff --git a/.github/docker/debian/bookworm/arm32v7/fsa.release.Dockerfile b/.github/docker/debian/bookworm/arm32v7/fsa.release.Dockerfile
@@ -0,0 +1,61 @@
+ARG BUILDER_IMAGE=arm32v7/debian:bookworm-20240513
+
+FROM --platform=linux/arm/v7 ${BUILDER_IMAGE} AS builder
+
+ARG MAINTAINER_NAME="Andrey Volk"
+ARG MAINTAINER_EMAIL="[email protected]"
+
+ARG BUILD_NUMBER=42
+ARG GIT_SHA=0000000000
+
+ARG DATA_DIR=/data
+
+LABEL maintainer="${MAINTAINER_NAME} <${MAINTAINER_EMAIL}>"
+
+SHELL ["/bin/bash", "-c"]
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get -q update \
+    && apt-get -y -q install \
+        apt-transport-https \
+        autoconf \
+        automake \
+        build-essential \
+        ca-certificates \
+        cmake \
+        curl \
+        debhelper \
+        devscripts \
+        dh-autoreconf \
+        dos2unix \
+        doxygen \
+        dpkg-dev \
+        git \
+        graphviz \
+        libglib2.0-dev \
+        libssl-dev \
+        lsb-release \
+        pkg-config \
+        wget
+
+RUN update-ca-certificates --fresh
+
+RUN git config --global --add safe.directory '*' \
+    && git config --global user.name "${MAINTAINER_NAME}" \
+    && git config --global user.email "${MAINTAINER_EMAIL}"
+
+# Bootstrap and Build
+COPY . ${DATA_DIR}
+WORKDIR ${DATA_DIR}
+
+RUN PACKAGE_RELEASE="${BUILD_NUMBER}.${GIT_SHA}" cmake . \
+        -DCMAKE_BUILD_TYPE=Debug \
+        -DCMAKE_INSTALL_PREFIX="/usr" \
+    && make package \
+    && mkdir OUT \
+    && mv -v *.deb OUT/.
+
+# Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
+FROM scratch
+COPY --from=builder /data/OUT/ /