Bot Updating Package Versions

remove stream.conf

Dockerfile

@@ -76,7 +76,7 @@ RUN \
     php83-xmlreader \
     php83-xsl \
     whois && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
+  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
     php83-pecl-mcrypt && \
   echo "**** install certbot plugins ****" && \
   if [ -z ${CERTBOT_VERSION+x} ]; then \
@@ -144,6 +144,8 @@ RUN \
   sed -i \
     's|#ssl_trusted_certificate /config/keys/cert.crt;|ssl_trusted_certificate /config/keys/cert.crt;|' \
     /defaults/nginx/ssl.conf.sample && \
+  echo "**** remove stream.conf ****" && \
+  rm -f /etc/nginx/conf.d/stream.conf && \
   echo "**** correct ip6tables legacy issue ****" && \
   rm \
     /sbin/ip6tables && \

Dockerfile.aarch64

@@ -76,7 +76,7 @@ RUN \
     php83-xmlreader \
     php83-xsl \
     whois && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
+  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
     php83-pecl-mcrypt && \
   echo "**** install certbot plugins ****" && \
   if [ -z ${CERTBOT_VERSION+x} ]; then \
@@ -144,6 +144,8 @@ RUN \
   sed -i \
     's|#ssl_trusted_certificate /config/keys/cert.crt;|ssl_trusted_certificate /config/keys/cert.crt;|' \
     /defaults/nginx/ssl.conf.sample && \
+  echo "**** remove stream.conf ****" && \
+  rm -f /etc/nginx/conf.d/stream.conf && \
   echo "**** correct ip6tables legacy issue ****" && \
   rm \
     /sbin/ip6tables && \

README.md

@@ -400,6 +400,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **04.03.24:** - Remove `stream.conf` inside the container to allow users to include their own block in `nginx.conf`.
 * **23.01.24:** - Rebase to Alpine 3.19 with php 8.3, add root periodic crontabs for logrotate.
 * **01.01.24:** - Add GleSYS DNS plugin.
 * **11.12.23:** - Deprecate certbot-dns-dynu to resolve dependency conflicts with other plugins.

package_versions.txt

@@ -3,7 +3,7 @@ ConfigArgParse                  1.7                    python
 PyJWT                           2.8.0                  python                   
 PyNamecheap                     0.0.3                  python                   
 PyYAML                          6.0.1                  python                   
-Simple Launcher                 1.1.0.14               dotnet  
+Simple Launcher                 1.1.0.14               dotnet  (+5 duplicates)  
 acme                            2.9.0                  python                   
 alpine-baselayout               3.4.3-r2               apk                      
 alpine-baselayout-data          3.4.3-r2               apk                      
@@ -17,14 +17,14 @@ apr-util                        1.6.3-r1               apk
 argon2-libs                     20190702-r5            apk                      
 attrs                           23.2.0                 python                   
 azure-common                    1.1.28                 python                   
-azure-core                      1.30.0                 python  
+azure-core                      1.30.1                 python                   
 azure-identity                  1.15.0                 python                   
 azure-mgmt-core                 1.4.0                  python                   
 azure-mgmt-dns                  8.1.0                  python                   
 bash                            5.2.21-r0              apk                      
 beautifulsoup4                  4.12.3                 python                   
-boto3                           1.34.49                python  
+boto3                           1.34.56                python                   
-botocore                        1.34.49                python  
+botocore                        1.34.56                python                   
 brotli-libs                     1.1.0-r1               apk                      
 bs4                             0.0.2                  python                   
 busybox                         1.36.1-r15             apk                      
@@ -33,7 +33,7 @@ c-ares                          1.24.0-r1              apk
 c-client                        2007f-r15              apk                      
 ca-certificates                 20230506-r0            apk                      
 ca-certificates-bundle          20230506-r0            apk                      
-cachetools                      5.3.2                  python  
+cachetools                      5.3.3                  python                   
 certbot                         2.9.0                  python                   
 certbot-dns-acmedns             0.1.0                  python                   
 certbot-dns-aliyun              2.0.0                  python                   
@@ -43,7 +43,7 @@ certbot-dns-cloudflare          2.9.0                  python
 certbot-dns-cpanel              0.4.0                  python                   
 certbot-dns-desec               1.2.1                  python                   
 certbot-dns-digitalocean        2.9.0                  python                   
-certbot-dns-directadmin         1.0.3                  python  
+certbot-dns-directadmin         1.0.4                  python                   
 certbot-dns-dnsimple            2.9.0                  python                   
 certbot-dns-dnsmadeeasy         2.9.0                  python                   
 certbot-dns-dnspod              0.1.0                  python                   
@@ -115,7 +115,7 @@ gnupg-utils                     2.4.4-r0               apk
 gnupg-wks-client                2.4.4-r0               apk                      
 gnutls                          3.8.3-r0               apk                      
 google-api-core                 2.17.1                 python                   
-google-api-python-client        2.119.0                python  
+google-api-python-client        2.121.0                python                   
 google-auth                     2.28.1                 python                   
 google-auth-httplib2            0.2.0                  python                   
 googleapis-common-protos        1.62.0                 python                   
@@ -145,7 +145,7 @@ libbz2                          1.0.8-r6               apk
 libc-utils                      0.7.2-r5               apk                      
 libcrypto3                      3.1.4-r5               apk                      
 libcurl                         8.5.0-r0               apk                      
-libdav1d                        1.3.0-r0               apk     
+libdav1d                        1.3.0-r1               apk                      
 libedit                         20230828.3.1-r3        apk                      
 libevent                        2.1.12-r7              apk                      
 libexpat                        2.6.0-r0               apk                      
@@ -198,7 +198,7 @@ logrotate                       3.21.0-r1              apk
 loopialib                       0.2.0                  python                   
 lxml                            5.1.0                  python                   
 lz4-libs                        1.9.4-r5               apk                      
-marshmallow                     3.20.2                 python  
+marshmallow                     3.21.1                 python                   
 memcached                       1.6.22-r0              apk                      
 mock                            5.1.0                  python                   
 mpdecimal                       2.5.1-r2               apk                      
@@ -307,8 +307,8 @@ pyasn1-modules                  0.3.0                  python
 pyc                             3.11.8-r0              apk                      
 pycparser                       2.21                   python                   
 pyotp                           2.9.0                  python                   
-pyparsing                       3.1.1                  python  
+pyparsing                       3.1.2                  python                   
-python-dateutil                 2.8.2                  python  
+python-dateutil                 2.9.0.post0            python                   
 python-digitalocean             1.17.0                 python                   
 python-transip                  0.6.0                  python                   
 python3                         3.11.8-r0              apk                      
@@ -332,7 +332,7 @@ ssl_client                      1.36.1-r15             apk
 tiff                            4.6.0-r0               apk                      
 tldextract                      5.1.1                  python                   
 typing-inspect                  0.9.0                  python                   
-typing_extensions               4.9.0                  python  
+typing_extensions               4.10.0                 python                   
 tzdata                          2024a-r0               apk                      
 unixodbc                        2.3.12-r0              apk                      
 uritemplate                     4.1.1                  python                   

readme-vars.yml

@@ -168,6 +168,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "04.03.24:", desc: "Remove `stream.conf` inside the container to allow users to include their own block in `nginx.conf`." }
   - { date: "23.01.24:", desc: "Rebase to Alpine 3.19 with php 8.3, add root periodic crontabs for logrotate." }
   - { date: "01.01.24:", desc: "Add GleSYS DNS plugin." }
   - { date: "11.12.23:", desc: "Deprecate certbot-dns-dynu to resolve dependency conflicts with other plugins." }

root/etc/s6-overlay/s6-rc.d/init-certbot-config/run

@@ -23,6 +23,13 @@ for i in "${SANED_VARS[@]}"; do
     export echo "${i}"="$(echo "${!i}" | tr '[:upper:]' '[:lower:]')"
 done
 
+# Check for and install requested DNS plugins
+if grep -q "universal-package-install" <<< "${DOCKER_MODS}" && grep -q "certbot-dns" <<< "${INSTALL_PIP_PACKAGES}"; then
+    echo "**** Installing requested dns plugins ****"
+    /etc/s6-overlay/s6-rc.d/init-mod-universal-package-install-add-package/run
+    /etc/s6-overlay/s6-rc.d/init-mods-package-install/run
+fi
+
 # check to make sure DNSPLUGIN is selected if dns validation is used
 CERTBOT_DNS_AUTHENTICATORS=$(certbot plugins --authenticators 2>/dev/null | sed -e 's/^Entry point: EntryPoint(name='\''cpanel'\''/Entry point: EntryPoint(name='\''dns-cpanel'\''/' -e '/EntryPoint(name='\''dns-/!d' -e 's/^Entry point: EntryPoint(name='\''dns-\([^ ]*\)'\'',/\1/' | sort)
 if [[ "${VALIDATION}" = "dns" ]] && ! echo "${CERTBOT_DNS_AUTHENTICATORS}" | grep -q "${DNSPLUGIN}"; then