Bot Updating Package Versions

Jenkinsfile

@@ -343,9 +343,11 @@ pipeline {
               if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
                 cd ${TEMPDIR}/unraid/templates/
                 if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
-                  echo "Image is on the ignore list, removing Unraid template"
+                  echo "Image is on the ignore list, marking Unraid template as deprecated"
-                  git rm unraid/${CONTAINER_NAME}.xml || :
+                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
-                  git commit -m 'Bot Removing Deprecated Unraid Template' || :
+                  git add -u unraid/${CONTAINER_NAME}.xml
+                  git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || :
+                  git commit -m 'Bot Moving Deprecated Unraid Template' || :
                 else
                   cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                   git add unraid/${CONTAINER_NAME}.xml

README.md

@@ -46,17 +46,17 @@ SWAG - Secure Web Application Gateway (formerly known as letsencrypt, no relatio
 
 ## Supported Architectures
 
-Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
+We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
 
-Simply pulling `lscr.io/linuxserver/swag` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+Simply pulling `lscr.io/linuxserver/swag:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
 
 The architectures supported by this image are:
 
-| Architecture | Tag |
+| Architecture | Available | Tag |
-| :----: | --- |
+| :----: | :----: | ---- |
-| x86-64 | amd64-latest |
+| x86-64 | ✅ | amd64-\<version tag\> |
-| arm64 | arm64v8-latest |
+| arm64 | ✅ | arm64v8-\<version tag\> |
-| armhf | arm32v7-latest |
+| armhf| ✅ | arm32v7-\<version tag\> |
 
 ## Application Setup
 
@@ -144,7 +144,7 @@ Here are some example snippets to help you get started creating a container.
 version: "2.1"
 services:
   swag:
-    image: lscr.io/linuxserver/swag
+    image: lscr.io/linuxserver/swag:latest
     container_name: swag
     cap_add:
       - NET_ADMIN
@@ -195,7 +195,7 @@ docker run -d \
   -p 80:80 `#optional` \
   -v /path/to/appdata/config:/config \
   --restart unless-stopped \
-  lscr.io/linuxserver/swag
+  lscr.io/linuxserver/swag:latest
 ```
 
 ## Parameters
@@ -222,6 +222,10 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-e STAGING=false` | Set to `true` to retrieve certs in staging mode. Rate limits will be much higher, but the resulting cert will not pass the browser's security test. Only to be used for testing purposes. |
 | `-v /config` | All the config files including the webroot reside here. |
 
+### Portainer notice
+
+This image utilises `cap_add` or `sysctl` to work properly. This is not implemented properly in some versions of Portainer, thus this image may not work if deployed through Portainer.
+
 ## Environment variables from files (Docker secrets)
 
 You can set any environment variable from a file by using a special prepend `FILE__`.
@@ -265,7 +269,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 * container version number
   * `docker inspect -f '{{ index .Config.Labels "build_version" }}' swag`
 * image version number
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/swag`
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/swag:latest`
 
 ## Updating Info
 
@@ -283,7 +287,7 @@ Below are the instructions for updating containers:
 
 ### Via Docker Run
 
-* Update the image: `docker pull lscr.io/linuxserver/swag`
+* Update the image: `docker pull lscr.io/linuxserver/swag:latest`
 * Stop the running container: `docker stop swag`
 * Delete the container: `docker rm swag`
 * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)

package_versions.txt

@@ -15,7 +15,7 @@ coreutils-8.32-r2
 curl-7.79.1-r1
 expat-2.4.7-r0
 fail2ban-0.11.2-r0
-freetype-2.10.4-r1
+freetype-2.10.4-r2
 gdbm-1.19-r0
 git-2.32.1-r0
 git-perl-2.32.1-r0
@@ -34,7 +34,7 @@ libbsd-0.11.3-r0
 libbz2-1.0.8-r1
 libc-utils-0.7.2-r3
 libcap-2.50-r0
-libcrypto1.1-1.1.1n-r0
+libcrypto1.1-1.1.1o-r0
 libcurl-7.79.1-r1
 libedit-20210216.3.1-r0
 libevent-2.1.12-r2
@@ -68,7 +68,7 @@ libseccomp-2.5.1-r2
 libsecret-0.20.4-r1
 libsm-1.2.3-r0
 libsodium-1.0.18-r0
-libssl1.1-1.1.1n-r0
+libssl1.1-1.1.1o-r0
 libstdc++-10.3.1_git20210424-r2
 libtasn1-4.17.0-r0
 libunistring-0.9.10-r1
@@ -79,7 +79,7 @@ libxau-1.0.9-r0
 libxcb-1.14-r2
 libxdmcp-1.1.3-r0
 libxext-1.3.4-r0
-libxml2-2.9.13-r0
+libxml2-2.9.14-r0
 libxpm-3.5.13-r0
 libxslt-1.1.35-r0
 libxt-1.2.1-r0
@@ -96,26 +96,26 @@ ncurses-libs-6.2_p20210612-r0
 ncurses-terminfo-base-6.2_p20210612-r0
 nettle-3.7.3-r0
 nghttp2-libs-1.43.0-r0
-nginx-1.20.2-r0
+nginx-1.20.2-r1
-nginx-mod-devel-kit-1.20.2-r0
+nginx-mod-devel-kit-1.20.2-r1
-nginx-mod-http-brotli-1.20.2-r0
+nginx-mod-http-brotli-1.20.2-r1
-nginx-mod-http-dav-ext-1.20.2-r0
+nginx-mod-http-dav-ext-1.20.2-r1
-nginx-mod-http-echo-1.20.2-r0
+nginx-mod-http-echo-1.20.2-r1
-nginx-mod-http-fancyindex-1.20.2-r0
+nginx-mod-http-fancyindex-1.20.2-r1
-nginx-mod-http-geoip2-1.20.2-r0
+nginx-mod-http-geoip2-1.20.2-r1
-nginx-mod-http-headers-more-1.20.2-r0
+nginx-mod-http-headers-more-1.20.2-r1
-nginx-mod-http-image-filter-1.20.2-r0
+nginx-mod-http-image-filter-1.20.2-r1
-nginx-mod-http-nchan-1.20.2-r0
+nginx-mod-http-nchan-1.20.2-r1
-nginx-mod-http-perl-1.20.2-r0
+nginx-mod-http-perl-1.20.2-r1
-nginx-mod-http-redis2-1.20.2-r0
+nginx-mod-http-redis2-1.20.2-r1
-nginx-mod-http-set-misc-1.20.2-r0
+nginx-mod-http-set-misc-1.20.2-r1
-nginx-mod-http-upload-progress-1.20.2-r0
+nginx-mod-http-upload-progress-1.20.2-r1
-nginx-mod-http-xslt-filter-1.20.2-r0
+nginx-mod-http-xslt-filter-1.20.2-r1
-nginx-mod-mail-1.20.2-r0
+nginx-mod-mail-1.20.2-r1
-nginx-mod-rtmp-1.20.2-r0
+nginx-mod-rtmp-1.20.2-r1
-nginx-mod-stream-1.20.2-r0
+nginx-mod-stream-1.20.2-r1
-nginx-mod-stream-geoip2-1.20.2-r0
+nginx-mod-stream-geoip2-1.20.2-r1
-nginx-vim-1.20.2-r0
+nginx-vim-1.20.2-r1
 npth-1.6-r0
 oniguruma-6.9.7.1-r0
 openssl-1.1.1n-r0
@@ -223,5 +223,5 @@ utmps-0.1.0.2-r0
 whois-5.5.10-r0
 xz-5.2.5-r1
 xz-libs-5.2.5-r1
-zlib-1.2.12-r0
+zlib-1.2.12-r1
 zstd-libs-1.4.9-r1