Skip to content

Commit 5d1192b

Browse files
andywolkandywolk
committed
Merge branch 'master' into release
2 parents 2855489 + e8d6757 commit 5d1192b

19 files changed

Lines changed: 672 additions & 194 deletions

.github/docker/debian/bookworm/amd64/Dockerfile renamed to .github/docker/debian/bookworm/amd64/prerelease.Dockerfile

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,9 @@ FROM ${BUILDER_IMAGE} AS builder
55
ARG MAINTAINER_NAME="Andrey Volk"
66
ARG MAINTAINER_EMAIL="andrey@signalwire.com"
77

8-
ARG CODENAME=bookworm
9-
ARG ARCH=amd64
10-
11-
# Credentials
12-
ARG REPO_DOMAIN=freeswitch.signalwire.com
13-
ARG REPO_USERNAME=user
14-
158
ARG BUILD_NUMBER=42
169
ARG GIT_SHA=0000000000
1710

18-
ARG GPG_KEY="/usr/share/keyrings/signalwire-freeswitch-repo.gpg"
19-
2011
ARG DATA_DIR=/data
2112

2213
LABEL maintainer="${MAINTAINER_NAME} <${MAINTAINER_EMAIL}>"
@@ -52,31 +43,14 @@ RUN apt-get -q update \
5243

5344
RUN update-ca-certificates --fresh
5445

55-
RUN echo "export CODENAME=${CODENAME}" | tee ~/.env \
56-
&& echo "export ARCH=${ARCH}" | tee -a ~/.env \
57-
&& chmod +x ~/.env
58-
59-
RUN . ~/.env && cat <<EOF > /etc/apt/sources.list.d/freeswitch.list
60-
deb [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/debian-release ${CODENAME} main
61-
deb-src [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/debian-release ${CODENAME} main
62-
EOF
63-
6446
RUN git config --global --add safe.directory '*' \
6547
&& git config --global user.name "${MAINTAINER_NAME}" \
6648
&& git config --global user.email "${MAINTAINER_EMAIL}"
6749

6850
RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
69-
printf "machine ${REPO_DOMAIN} " > /etc/apt/auth.conf && \
70-
printf "login ${REPO_USERNAME} " >> /etc/apt/auth.conf && \
71-
printf "password " >> /etc/apt/auth.conf && \
72-
cat /run/secrets/REPO_PASSWORD >> /etc/apt/auth.conf && \
7351
sha512sum /run/secrets/REPO_PASSWORD && \
74-
curl \
75-
--fail \
76-
--netrc-file /etc/apt/auth.conf \
77-
--output ${GPG_KEY} \
78-
https://${REPO_DOMAIN}/repo/deb/debian-release/signalwire-freeswitch-repo.gpg && \
79-
file ${GPG_KEY} && \
52+
curl -sSL https://freeswitch.org/fsget | \
53+
bash -s $(cat /run/secrets/REPO_PASSWORD) prerelease && \
8054
apt-get --quiet update && \
8155
apt-get --yes --quiet install \
8256
libks2 \

‎.github/docker/debian/bookworm/amd64/release.Dockerfile‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
ARG BUILDER_IMAGE=debian:bookworm-20240513
2+
3+
FROM ${BUILDER_IMAGE} AS builder
4+
5+
ARG MAINTAINER_NAME="Andrey Volk"
6+
ARG MAINTAINER_EMAIL="andrey@signalwire.com"
7+
8+
ARG BUILD_NUMBER=42
9+
ARG GIT_SHA=0000000000
10+
11+
ARG DATA_DIR=/data
12+
13+
LABEL maintainer="${MAINTAINER_NAME} <${MAINTAINER_EMAIL}>"
14+
15+
SHELL ["/bin/bash", "-c"]
16+
17+
ENV DEBIAN_FRONTEND=noninteractive
18+
19+
RUN apt-get -q update \
20+
&& apt-get -y -q install \
21+
apt-transport-https \
22+
autoconf \
23+
automake \
24+
build-essential \
25+
ca-certificates \
26+
cmake \
27+
curl \
28+
debhelper \
29+
devscripts \
30+
dh-autoreconf \
31+
dos2unix \
32+
doxygen \
33+
dpkg-dev \
34+
git \
35+
gnupg2 \
36+
graphviz \
37+
libglib2.0-dev \
38+
libssl-dev \
39+
lsb-release \
40+
pkg-config \
41+
unzip \
42+
wget
43+
44+
RUN update-ca-certificates --fresh
45+
46+
RUN git config --global --add safe.directory '*' \
47+
&& git config --global user.name "${MAINTAINER_NAME}" \
48+
&& git config --global user.email "${MAINTAINER_EMAIL}"
49+
50+
RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
51+
sha512sum /run/secrets/REPO_PASSWORD && \
52+
curl -sSL https://freeswitch.org/fsget | \
53+
bash -s $(cat /run/secrets/REPO_PASSWORD) release && \
54+
apt-get --quiet update && \
55+
apt-get --yes --quiet install \
56+
libks2 \
57+
&& rm -f /etc/apt/auth.conf
58+
59+
# Bootstrap and Build
60+
COPY . ${DATA_DIR}
61+
WORKDIR ${DATA_DIR}
62+
63+
RUN PACKAGE_RELEASE="${BUILD_NUMBER}.${GIT_SHA}" cmake . \
64+
-DCMAKE_BUILD_TYPE=Debug \
65+
-DCMAKE_INSTALL_PREFIX="/usr" \
66+
&& make package \
67+
&& mkdir OUT \
68+
&& mv -v *.deb OUT/.
69+
70+
# Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
71+
FROM scratch
72+
COPY --from=builder /data/OUT/ /

.github/docker/debian/bookworm/arm32v7/Dockerfile renamed to .github/docker/debian/bookworm/arm32v7/prerelease.Dockerfile

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,9 @@ FROM --platform=linux/arm/v7 ${BUILDER_IMAGE} AS builder
55
ARG MAINTAINER_NAME="Andrey Volk"
66
ARG MAINTAINER_EMAIL="andrey@signalwire.com"
77

8-
ARG CODENAME=bookworm
9-
ARG ARCH=arm32
10-
11-
# Credentials
12-
ARG REPO_DOMAIN=freeswitch.signalwire.com
13-
ARG REPO_USERNAME=user
14-
158
ARG BUILD_NUMBER=42
169
ARG GIT_SHA=0000000000
1710

18-
ARG GPG_KEY="/usr/share/keyrings/signalwire-freeswitch-repo.gpg"
19-
2011
ARG DATA_DIR=/data
2112

2213
LABEL maintainer="${MAINTAINER_NAME} <${MAINTAINER_EMAIL}>"
@@ -52,31 +43,14 @@ RUN apt-get -q update \
5243

5344
RUN update-ca-certificates --fresh
5445

55-
RUN echo "export CODENAME=${CODENAME}" | tee ~/.env \
56-
&& echo "export ARCH=${ARCH}" | tee -a ~/.env \
57-
&& chmod +x ~/.env
58-
59-
RUN . ~/.env && cat <<EOF > /etc/apt/sources.list.d/freeswitch.list
60-
deb [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/rpi/debian-release ${CODENAME} main
61-
deb-src [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/rpi/debian-release ${CODENAME} main
62-
EOF
63-
6446
RUN git config --global --add safe.directory '*' \
6547
&& git config --global user.name "${MAINTAINER_NAME}" \
6648
&& git config --global user.email "${MAINTAINER_EMAIL}"
6749

6850
RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
69-
printf "machine ${REPO_DOMAIN} " > /etc/apt/auth.conf && \
70-
printf "login ${REPO_USERNAME} " >> /etc/apt/auth.conf && \
71-
printf "password " >> /etc/apt/auth.conf && \
72-
cat /run/secrets/REPO_PASSWORD >> /etc/apt/auth.conf && \
7351
sha512sum /run/secrets/REPO_PASSWORD && \
74-
curl \
75-
--fail \
76-
--netrc-file /etc/apt/auth.conf \
77-
--output ${GPG_KEY} \
78-
https://${REPO_DOMAIN}/repo/deb/rpi/debian-release/signalwire-freeswitch-repo.gpg && \
79-
file ${GPG_KEY} && \
52+
curl -sSL https://freeswitch.org/fsget | \
53+
bash -s $(cat /run/secrets/REPO_PASSWORD) prerelease && \
8054
apt-get --quiet update && \
8155
apt-get --yes --quiet install \
8256
libks2 \

‎.github/docker/debian/bookworm/arm32v7/release.Dockerfile‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
ARG BUILDER_IMAGE=arm32v7/debian:bookworm-20240513
2+
3+
FROM --platform=linux/arm/v7 ${BUILDER_IMAGE} AS builder
4+
5+
ARG MAINTAINER_NAME="Andrey Volk"
6+
ARG MAINTAINER_EMAIL="andrey@signalwire.com"
7+
8+
ARG BUILD_NUMBER=42
9+
ARG GIT_SHA=0000000000
10+
11+
ARG DATA_DIR=/data
12+
13+
LABEL maintainer="${MAINTAINER_NAME} <${MAINTAINER_EMAIL}>"
14+
15+
SHELL ["/bin/bash", "-c"]
16+
17+
ENV DEBIAN_FRONTEND=noninteractive
18+
19+
RUN apt-get -q update \
20+
&& apt-get -y -q install \
21+
apt-transport-https \
22+
autoconf \
23+
automake \
24+
build-essential \
25+
ca-certificates \
26+
cmake \
27+
curl \
28+
debhelper \
29+
devscripts \
30+
dh-autoreconf \
31+
dos2unix \
32+
doxygen \
33+
dpkg-dev \
34+
git \
35+
gnupg2 \
36+
graphviz \
37+
libglib2.0-dev \
38+
libssl-dev \
39+
lsb-release \
40+
pkg-config \
41+
unzip \
42+
wget
43+
44+
RUN update-ca-certificates --fresh
45+
46+
RUN git config --global --add safe.directory '*' \
47+
&& git config --global user.name "${MAINTAINER_NAME}" \
48+
&& git config --global user.email "${MAINTAINER_EMAIL}"
49+
50+
RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
51+
sha512sum /run/secrets/REPO_PASSWORD && \
52+
curl -sSL https://freeswitch.org/fsget | \
53+
bash -s $(cat /run/secrets/REPO_PASSWORD) release && \
54+
apt-get --quiet update && \
55+
apt-get --yes --quiet install \
56+
libks2 \
57+
&& rm -f /etc/apt/auth.conf
58+
59+
# Bootstrap and Build
60+
COPY . ${DATA_DIR}
61+
WORKDIR ${DATA_DIR}
62+
63+
RUN PACKAGE_RELEASE="${BUILD_NUMBER}.${GIT_SHA}" cmake . \
64+
-DCMAKE_BUILD_TYPE=Debug \
65+
-DCMAKE_INSTALL_PREFIX="/usr" \
66+
&& make package \
67+
&& mkdir OUT \
68+
&& mv -v *.deb OUT/.
69+
70+
# Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
71+
FROM scratch
72+
COPY --from=builder /data/OUT/ /

.github/docker/debian/bookworm/arm64v8/Dockerfile renamed to .github/docker/debian/bookworm/arm64v8/prerelease.Dockerfile

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,9 @@ FROM --platform=linux/arm64 ${BUILDER_IMAGE} AS builder
55
ARG MAINTAINER_NAME="Andrey Volk"
66
ARG MAINTAINER_EMAIL="andrey@signalwire.com"
77

8-
ARG CODENAME=bookworm
9-
ARG ARCH=arm64
10-
11-
# Credentials
12-
ARG REPO_DOMAIN=freeswitch.signalwire.com
13-
ARG REPO_USERNAME=user
14-
158
ARG BUILD_NUMBER=42
169
ARG GIT_SHA=0000000000
1710

18-
ARG GPG_KEY="/usr/share/keyrings/signalwire-freeswitch-repo.gpg"
19-
2011
ARG DATA_DIR=/data
2112

2213
LABEL maintainer="${MAINTAINER_NAME} <${MAINTAINER_EMAIL}>"
@@ -52,31 +43,14 @@ RUN apt-get -q update \
5243

5344
RUN update-ca-certificates --fresh
5445

55-
RUN echo "export CODENAME=${CODENAME}" | tee ~/.env \
56-
&& echo "export ARCH=${ARCH}" | tee -a ~/.env \
57-
&& chmod +x ~/.env
58-
59-
RUN . ~/.env && cat <<EOF > /etc/apt/sources.list.d/freeswitch.list
60-
deb [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/debian-release ${CODENAME} main
61-
deb-src [signed-by=${GPG_KEY}] https://${REPO_DOMAIN}/repo/deb/debian-release ${CODENAME} main
62-
EOF
63-
6446
RUN git config --global --add safe.directory '*' \
6547
&& git config --global user.name "${MAINTAINER_NAME}" \
6648
&& git config --global user.email "${MAINTAINER_EMAIL}"
6749

6850
RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
69-
printf "machine ${REPO_DOMAIN} " > /etc/apt/auth.conf && \
70-
printf "login ${REPO_USERNAME} " >> /etc/apt/auth.conf && \
71-
printf "password " >> /etc/apt/auth.conf && \
72-
cat /run/secrets/REPO_PASSWORD >> /etc/apt/auth.conf && \
7351
sha512sum /run/secrets/REPO_PASSWORD && \
74-
curl \
75-
--fail \
76-
--netrc-file /etc/apt/auth.conf \
77-
--output ${GPG_KEY} \
78-
https://${REPO_DOMAIN}/repo/deb/debian-release/signalwire-freeswitch-repo.gpg && \
79-
file ${GPG_KEY} && \
52+
curl -sSL https://freeswitch.org/fsget | \
53+
bash -s $(cat /run/secrets/REPO_PASSWORD) prerelease && \
8054
apt-get --quiet update && \
8155
apt-get --yes --quiet install \
8256
libks2 \

‎.github/docker/debian/bookworm/arm64v8/release.Dockerfile‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
ARG BUILDER_IMAGE=arm64v8/debian:bookworm-20240513
2+
3+
FROM --platform=linux/arm64 ${BUILDER_IMAGE} AS builder
4+
5+
ARG MAINTAINER_NAME="Andrey Volk"
6+
ARG MAINTAINER_EMAIL="andrey@signalwire.com"
7+
8+
ARG BUILD_NUMBER=42
9+
ARG GIT_SHA=0000000000
10+
11+
ARG DATA_DIR=/data
12+
13+
LABEL maintainer="${MAINTAINER_NAME} <${MAINTAINER_EMAIL}>"
14+
15+
SHELL ["/bin/bash", "-c"]
16+
17+
ENV DEBIAN_FRONTEND=noninteractive
18+
19+
RUN apt-get -q update \
20+
&& apt-get -y -q install \
21+
apt-transport-https \
22+
autoconf \
23+
automake \
24+
build-essential \
25+
ca-certificates \
26+
cmake \
27+
curl \
28+
debhelper \
29+
devscripts \
30+
dh-autoreconf \
31+
dos2unix \
32+
doxygen \
33+
dpkg-dev \
34+
git \
35+
gnupg2 \
36+
graphviz \
37+
libglib2.0-dev \
38+
libssl-dev \
39+
lsb-release \
40+
pkg-config \
41+
unzip \
42+
wget
43+
44+
RUN update-ca-certificates --fresh
45+
46+
RUN git config --global --add safe.directory '*' \
47+
&& git config --global user.name "${MAINTAINER_NAME}" \
48+
&& git config --global user.email "${MAINTAINER_EMAIL}"
49+
50+
RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
51+
sha512sum /run/secrets/REPO_PASSWORD && \
52+
curl -sSL https://freeswitch.org/fsget | \
53+
bash -s $(cat /run/secrets/REPO_PASSWORD) release && \
54+
apt-get --quiet update && \
55+
apt-get --yes --quiet install \
56+
libks2 \
57+
&& rm -f /etc/apt/auth.conf
58+
59+
# Bootstrap and Build
60+
COPY . ${DATA_DIR}
61+
WORKDIR ${DATA_DIR}
62+
63+
RUN PACKAGE_RELEASE="${BUILD_NUMBER}.${GIT_SHA}" cmake . \
64+
-DCMAKE_BUILD_TYPE=Debug \
65+
-DCMAKE_INSTALL_PREFIX="/usr" \
66+
&& make package \
67+
&& mkdir OUT \
68+
&& mv -v *.deb OUT/.
69+
70+
# Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
71+
FROM scratch
72+
COPY --from=builder /data/OUT/ /

0 commit comments

Comments
 (0)