Skip to content

Commit 26e5a7f

Browse files
andywolkandywolk
authored
Merge pull request #35 from freeswitch/fsget
[GHA] Use `fsget`
2 parents ab016ce + 3cb2148 commit 26e5a7f

File tree

12 files changed

+30
-258
lines changed

12 files changed

+30
-258
lines changed

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

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ ARG MAINTAINER_NAME="Andrey Volk"
66
ARG MAINTAINER_EMAIL="[email protected]"
77

88
ARG CODENAME=bookworm
9-
ARG ARCH=amd64
10-
11-
# Credentials
12-
ARG REPO_DOMAIN=fsa.freeswitch.com
13-
ARG REPO_USERNAME=user
149

1510
ARG BUILD_NUMBER=42
1611
ARG GIT_SHA=0000000000
@@ -51,29 +46,16 @@ RUN apt-get -q update \
5146
RUN update-ca-certificates --fresh
5247

5348
RUN echo "export CODENAME=${CODENAME}" | tee ~/.env \
54-
&& echo "export ARCH=${ARCH}" | tee -a ~/.env \
5549
&& chmod +x ~/.env
5650

57-
RUN . ~/.env && cat <<EOF > /etc/apt/sources.list.d/freeswitch.list
58-
deb https://${REPO_DOMAIN}/repo/deb/fsa ${CODENAME} 1.8
59-
deb-src https://${REPO_DOMAIN}/repo/deb/fsa ${CODENAME} 1.8
60-
EOF
61-
6251
RUN git config --global --add safe.directory '*' \
6352
&& git config --global user.name "${MAINTAINER_NAME}" \
6453
&& git config --global user.email "${MAINTAINER_EMAIL}"
6554

6655
RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
67-
printf "machine ${REPO_DOMAIN} " > /etc/apt/auth.conf && \
68-
printf "login ${REPO_USERNAME} " >> /etc/apt/auth.conf && \
69-
printf "password " >> /etc/apt/auth.conf && \
70-
cat /run/secrets/REPO_PASSWORD >> /etc/apt/auth.conf && \
7156
sha512sum /run/secrets/REPO_PASSWORD && \
72-
curl \
73-
--fail \
74-
--netrc-file /etc/apt/auth.conf \
75-
https://${REPO_DOMAIN}/repo/deb/fsa/pubkey.gpg \
76-
| apt-key add - && \
57+
curl -sSL https://freeswitch.org/fsget | \
58+
bash -s $(cat /run/secrets/REPO_PASSWORD) release && \
7759
apt-get --quiet update && \
7860
apt-get --yes --quiet install \
7961
libexpat1-dev \

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

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,10 @@ ARG MAINTAINER_NAME="Andrey Volk"
66
ARG MAINTAINER_EMAIL="[email protected]"
77

88
ARG CODENAME=bookworm
9-
ARG ARCH=amd64
10-
11-
# Credentials
12-
ARG REPO_DOMAIN=freeswitch.signalwire.com
13-
ARG REPO_USERNAME=user
149

1510
ARG BUILD_NUMBER=42
1611
ARG GIT_SHA=0000000000
1712

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

2215
LABEL maintainer="${MAINTAINER_NAME} <${MAINTAINER_EMAIL}>"
@@ -53,30 +46,16 @@ RUN apt-get -q update \
5346
RUN update-ca-certificates --fresh
5447

5548
RUN echo "export CODENAME=${CODENAME}" | tee ~/.env \
56-
&& echo "export ARCH=${ARCH}" | tee -a ~/.env \
5749
&& chmod +x ~/.env
5850

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-
6451
RUN git config --global --add safe.directory '*' \
6552
&& git config --global user.name "${MAINTAINER_NAME}" \
6653
&& git config --global user.email "${MAINTAINER_EMAIL}"
6754

6855
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 && \
7356
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} && \
57+
curl -sSL https://freeswitch.org/fsget | \
58+
bash -s $(cat /run/secrets/REPO_PASSWORD) prerelease && \
8059
apt-get --quiet update && \
8160
apt-get --yes --quiet install \
8261
libexpat1-dev \
@@ -114,6 +93,7 @@ RUN ./bootstrap \
11493
&& ./configure \
11594
--with-sofia-sip=/usr \
11695
&& make install
96+
11797
COPY . ${DATA_DIR}
11898
WORKDIR ${DATA_DIR}
11999

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

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ ARG MAINTAINER_NAME="Andrey Volk"
66
ARG MAINTAINER_EMAIL="[email protected]"
77

88
ARG CODENAME=bookworm
9-
ARG ARCH=armhf
10-
11-
# Credentials
12-
ARG REPO_DOMAIN=fsa.freeswitch.com
13-
ARG REPO_USERNAME=user
149

1510
ARG BUILD_NUMBER=42
1611
ARG GIT_SHA=0000000000
@@ -51,29 +46,16 @@ RUN apt-get -q update \
5146
RUN update-ca-certificates --fresh
5247

5348
RUN echo "export CODENAME=${CODENAME}" | tee ~/.env \
54-
&& echo "export ARCH=${ARCH}" | tee -a ~/.env \
5549
&& chmod +x ~/.env
5650

57-
RUN . ~/.env && cat <<EOF > /etc/apt/sources.list.d/freeswitch.list
58-
deb https://${REPO_DOMAIN}/repo/deb/fsa-rpi/ ${CODENAME} 1.8
59-
deb-src https://${REPO_DOMAIN}/repo/deb/fsa-rpi/ ${CODENAME} 1.8
60-
EOF
61-
6251
RUN git config --global --add safe.directory '*' \
6352
&& git config --global user.name "${MAINTAINER_NAME}" \
6453
&& git config --global user.email "${MAINTAINER_EMAIL}"
6554

6655
RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
67-
printf "machine ${REPO_DOMAIN} " > /etc/apt/auth.conf && \
68-
printf "login ${REPO_USERNAME} " >> /etc/apt/auth.conf && \
69-
printf "password " >> /etc/apt/auth.conf && \
70-
cat /run/secrets/REPO_PASSWORD >> /etc/apt/auth.conf && \
7156
sha512sum /run/secrets/REPO_PASSWORD && \
72-
curl \
73-
--fail \
74-
--netrc-file /etc/apt/auth.conf \
75-
https://${REPO_DOMAIN}/repo/deb/fsa-rpi/pubkey.gpg \
76-
| apt-key add - && \
57+
curl -sSL https://freeswitch.org/fsget | \
58+
bash -s $(cat /run/secrets/REPO_PASSWORD) release && \
7759
apt-get --quiet update && \
7860
apt-get --yes --quiet install \
7961
libexpat1-dev \

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

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,10 @@ ARG MAINTAINER_NAME="Andrey Volk"
66
ARG MAINTAINER_EMAIL="[email protected]"
77

88
ARG CODENAME=bookworm
9-
ARG ARCH=arm32
10-
11-
# Credentials
12-
ARG REPO_DOMAIN=freeswitch.signalwire.com
13-
ARG REPO_USERNAME=user
149

1510
ARG BUILD_NUMBER=42
1611
ARG GIT_SHA=0000000000
1712

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

2215
LABEL maintainer="${MAINTAINER_NAME} <${MAINTAINER_EMAIL}>"
@@ -53,30 +46,16 @@ RUN apt-get -q update \
5346
RUN update-ca-certificates --fresh
5447

5548
RUN echo "export CODENAME=${CODENAME}" | tee ~/.env \
56-
&& echo "export ARCH=${ARCH}" | tee -a ~/.env \
5749
&& chmod +x ~/.env
5850

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-
6451
RUN git config --global --add safe.directory '*' \
6552
&& git config --global user.name "${MAINTAINER_NAME}" \
6653
&& git config --global user.email "${MAINTAINER_EMAIL}"
6754

6855
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 && \
7356
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} && \
57+
curl -sSL https://freeswitch.org/fsget | \
58+
bash -s $(cat /run/secrets/REPO_PASSWORD) prerelease && \
8059
apt-get --quiet update && \
8160
apt-get --yes --quiet install \
8261
libexpat1-dev \
@@ -114,6 +93,7 @@ RUN ./bootstrap \
11493
&& ./configure \
11594
--with-sofia-sip=/usr \
11695
&& make install
96+
11797
COPY . ${DATA_DIR}
11898
WORKDIR ${DATA_DIR}
11999

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

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ ARG MAINTAINER_NAME="Andrey Volk"
66
ARG MAINTAINER_EMAIL="[email protected]"
77

88
ARG CODENAME=bookworm
9-
ARG ARCH=arm64
10-
11-
# Credentials
12-
ARG REPO_DOMAIN=fsa.freeswitch.com
13-
ARG REPO_USERNAME=user
149

1510
ARG BUILD_NUMBER=42
1611
ARG GIT_SHA=0000000000
@@ -51,29 +46,16 @@ RUN apt-get -q update \
5146
RUN update-ca-certificates --fresh
5247

5348
RUN echo "export CODENAME=${CODENAME}" | tee ~/.env \
54-
&& echo "export ARCH=${ARCH}" | tee -a ~/.env \
5549
&& chmod +x ~/.env
5650

57-
RUN . ~/.env && cat <<EOF > /etc/apt/sources.list.d/freeswitch.list
58-
deb https://${REPO_DOMAIN}/repo/deb/fsa ${CODENAME} 1.8
59-
deb-src https://${REPO_DOMAIN}/repo/deb/fsa ${CODENAME} 1.8
60-
EOF
61-
6251
RUN git config --global --add safe.directory '*' \
6352
&& git config --global user.name "${MAINTAINER_NAME}" \
6453
&& git config --global user.email "${MAINTAINER_EMAIL}"
6554

6655
RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
67-
printf "machine ${REPO_DOMAIN} " > /etc/apt/auth.conf && \
68-
printf "login ${REPO_USERNAME} " >> /etc/apt/auth.conf && \
69-
printf "password " >> /etc/apt/auth.conf && \
70-
cat /run/secrets/REPO_PASSWORD >> /etc/apt/auth.conf && \
7156
sha512sum /run/secrets/REPO_PASSWORD && \
72-
curl \
73-
--fail \
74-
--netrc-file /etc/apt/auth.conf \
75-
https://${REPO_DOMAIN}/repo/deb/fsa/pubkey.gpg \
76-
| apt-key add - && \
57+
curl -sSL https://freeswitch.org/fsget | \
58+
bash -s $(cat /run/secrets/REPO_PASSWORD) release && \
7759
apt-get --quiet update && \
7860
apt-get --yes --quiet install \
7961
libexpat1-dev \

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

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,10 @@ ARG MAINTAINER_NAME="Andrey Volk"
66
ARG MAINTAINER_EMAIL="[email protected]"
77

88
ARG CODENAME=bookworm
9-
ARG ARCH=arm64
10-
11-
# Credentials
12-
ARG REPO_DOMAIN=freeswitch.signalwire.com
13-
ARG REPO_USERNAME=user
149

1510
ARG BUILD_NUMBER=42
1611
ARG GIT_SHA=0000000000
1712

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

2215
LABEL maintainer="${MAINTAINER_NAME} <${MAINTAINER_EMAIL}>"
@@ -53,30 +46,16 @@ RUN apt-get -q update \
5346
RUN update-ca-certificates --fresh
5447

5548
RUN echo "export CODENAME=${CODENAME}" | tee ~/.env \
56-
&& echo "export ARCH=${ARCH}" | tee -a ~/.env \
5749
&& chmod +x ~/.env
5850

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-
6451
RUN git config --global --add safe.directory '*' \
6552
&& git config --global user.name "${MAINTAINER_NAME}" \
6653
&& git config --global user.email "${MAINTAINER_EMAIL}"
6754

6855
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 && \
7356
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} && \
57+
curl -sSL https://freeswitch.org/fsget | \
58+
bash -s $(cat /run/secrets/REPO_PASSWORD) prerelease && \
8059
apt-get --quiet update && \
8160
apt-get --yes --quiet install \
8261
libexpat1-dev \
@@ -114,6 +93,7 @@ RUN ./bootstrap \
11493
&& ./configure \
11594
--with-sofia-sip=/usr \
11695
&& make install
96+
11797
COPY . ${DATA_DIR}
11898
WORKDIR ${DATA_DIR}
11999

‎.github/docker/debian/bullseye/amd64/fse.release.Dockerfile‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ ARG MAINTAINER_NAME="Andrey Volk"
66
ARG MAINTAINER_EMAIL="[email protected]"
77

88
ARG CODENAME=bullseye
9-
ARG ARCH=amd64
10-
11-
# Credentials
12-
ARG REPO_DOMAIN=fsa.freeswitch.com
13-
ARG REPO_USERNAME=user
149

1510
ARG BUILD_NUMBER=42
1611
ARG GIT_SHA=0000000000
@@ -51,29 +46,16 @@ RUN apt-get -q update \
5146
RUN update-ca-certificates --fresh
5247

5348
RUN echo "export CODENAME=${CODENAME}" | tee ~/.env \
54-
&& echo "export ARCH=${ARCH}" | tee -a ~/.env \
5549
&& chmod +x ~/.env
5650

57-
RUN . ~/.env && cat <<EOF > /etc/apt/sources.list.d/freeswitch.list
58-
deb https://${REPO_DOMAIN}/repo/deb/fsa ${CODENAME} 1.8
59-
deb-src https://${REPO_DOMAIN}/repo/deb/fsa ${CODENAME} 1.8
60-
EOF
61-
6251
RUN git config --global --add safe.directory '*' \
6352
&& git config --global user.name "${MAINTAINER_NAME}" \
6453
&& git config --global user.email "${MAINTAINER_EMAIL}"
6554

6655
RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
67-
printf "machine ${REPO_DOMAIN} " > /etc/apt/auth.conf && \
68-
printf "login ${REPO_USERNAME} " >> /etc/apt/auth.conf && \
69-
printf "password " >> /etc/apt/auth.conf && \
70-
cat /run/secrets/REPO_PASSWORD >> /etc/apt/auth.conf && \
7156
sha512sum /run/secrets/REPO_PASSWORD && \
72-
curl \
73-
--fail \
74-
--netrc-file /etc/apt/auth.conf \
75-
https://${REPO_DOMAIN}/repo/deb/fsa/pubkey.gpg \
76-
| apt-key add - && \
57+
curl -sSL https://freeswitch.org/fsget | \
58+
bash -s $(cat /run/secrets/REPO_PASSWORD) release && \
7759
apt-get --quiet update && \
7860
apt-get --yes --quiet install \
7961
libexpat1-dev \

0 commit comments

Comments
 (0)