Procházet zdrojové kódy

feat(prosody): use 0.12 nightly (#2061)

* feat(prosody): use 0.12 nightly, package can be overridden from build arg

* include proper package when tagging prosody docker version
Aaron van Meerten před 1 měsícem
rodič
revize
4076752900
2 změnil soubory, kde provedl 3 přidání a 2 odebrání
  1. 1 1
      .github/workflows/unstable.yml
  2. 2 1
      prosody/Dockerfile

+ 1 - 1
.github/workflows/unstable.yml

@@ -47,7 +47,7 @@ jobs:
         run: echo "version=$( apt-cache show jitsi-meet | head -10 | grep '^Pre-Depends:'| tr ',' '\n' | grep 'jitsi-videobridge2' | cut -d'=' -f2 | tr -d ')' | awk '{print $1}' )" >> $GITHUB_OUTPUT
       - name: Get current prosody versions
         id: prosody_version
-        run: echo "version=$( apt-cache madison prosody | awk '{print $3;}' | head -1 |  cut -d'-' -f1 )" >> $GITHUB_OUTPUT
+        run: echo "version=$( apt-cache madison prosody-0.12 | awk '{print $3;}' | head -1 |  cut -d'-' -f1 )" >> $GITHUB_OUTPUT
       - name: Get current jibri version
         id: jibri_version
         run: echo "version=$( apt-cache show jibri | head -10 | grep Version | awk '{print $2}' )" >> $GITHUB_OUTPUT

+ 2 - 1
prosody/Dockerfile

@@ -29,6 +29,7 @@ LABEL org.opencontainers.image.documentation="https://jitsi.github.io/handbook/"
 
 ARG VERSION_JITSI_CONTRIB_PROSODY_PLUGINS="20241017"
 ARG VERSION_MATRIX_USER_VERIFICATION_SERVICE_PLUGIN="1.8.0"
+ARG PROSODY_PACKAGE="prosody-0.12"
 
 RUN set -x && \
     wget -qO /etc/apt/trusted.gpg.d/prosody.gpg https://prosody.im/files/prosody-debian-packages.key && \
@@ -36,7 +37,7 @@ RUN set -x && \
     apt-dpkg-wrap apt-get update && \
     apt-dpkg-wrap apt-get install -y \
       lua5.4 \
-      prosody \
+      $PROSODY_PACKAGE \
       libldap-common \
       sasl2-bin \
       libsasl2-modules-ldap \