Преглед на файлове

Upgrade to bugfixed skarnet.org release, version: 3.1.4.1

Signed-off-by: Laurent Bercot <[email protected]>
Laurent Bercot преди 2 години
родител
ревизия
d29db89eeb
променени са 3 файла, в които са добавени 11 реда и са изтрити 11 реда
  1. 6 6
      README.md
  2. 1 1
      conf/defaults.mk
  3. 4 4
      conf/versions

+ 6 - 6
README.md

@@ -42,7 +42,7 @@ Build the following Dockerfile and try it out:
 ```
 ```
 # Use your favorite image
 # Use your favorite image
 FROM ubuntu
 FROM ubuntu
-ARG S6_OVERLAY_VERSION=3.1.4.0
+ARG S6_OVERLAY_VERSION=3.1.4.1
 
 
 RUN apt-get update && apt-get install -y nginx xz-utils
 RUN apt-get update && apt-get install -y nginx xz-utils
 RUN echo "daemon off;" >> /etc/nginx/nginx.conf
 RUN echo "daemon off;" >> /etc/nginx/nginx.conf
@@ -211,9 +211,9 @@ To install those tarballs, add lines to your Dockerfile that correspond
 to the functionality you want to install. For instance, most people would
 to the functionality you want to install. For instance, most people would
 use the following:
 use the following:
 ```
 ```
-ADD https://github.com/just-containers/s6-overlay/releases/download/v3.1.4.0/s6-overlay-noarch.tar.xz /tmp
+ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
 RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz
 RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz
-ADD https://github.com/just-containers/s6-overlay/releases/download/v3.1.4.0/s6-overlay-x86_64.tar.xz /tmp
+ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz /tmp
 RUN tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz
 RUN tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz
 ```
 ```
 
 
@@ -250,9 +250,9 @@ For example:
 
 
 ```
 ```
 FROM busybox
 FROM busybox
-ADD https://github.com/just-containers/s6-overlay/releases/download/v3.1.4.0/s6-overlay-noarch.tar.xz /tmp
+ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
 RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz
 RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz
-ADD https://github.com/just-containers/s6-overlay/releases/download/v3.1.4.0/s6-overlay-x86_64.tar.xz /tmp
+ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz /tmp
 RUN tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz
 RUN tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz
 ENTRYPOINT ["/init"]
 ENTRYPOINT ["/init"]
 ```
 ```
@@ -941,7 +941,7 @@ RUN cd /tmp && sha256sum -c *.sha256
 
 
 ### `USER` directive
 ### `USER` directive
 
 
-As of version 3.1.4.0, s6-overlay has limited support for running as a user other than `root`:
+As of version 3.1.4.1, s6-overlay has limited support for running as a user other than `root`:
 
 
 * Tools like `fix-attrs` and `logutil-service` are unlikely to work (they rely
 * Tools like `fix-attrs` and `logutil-service` are unlikely to work (they rely
   on being able to change UIDs).
   on being able to change UIDs).

+ 1 - 1
conf/defaults.mk

@@ -3,7 +3,7 @@
 # e.g.: make SHEBANGDIR=/usr/bin VERSION=3.1.4.0
 # e.g.: make SHEBANGDIR=/usr/bin VERSION=3.1.4.0
 
 
 # The version of the software being built.
 # The version of the software being built.
-VERSION := 3.1.4.0
+VERSION := 3.1.4.1
 
 
 # Where stuff is going to be built. Change for out-of-tree builds.
 # Where stuff is going to be built. Change for out-of-tree builds.
 OUTPUT := output
 OUTPUT := output

+ 4 - 4
conf/versions

@@ -10,22 +10,22 @@ BEARSSL_VERSION=46f7dddce75227f2e40ab94d66ceb9f19ee6b1b0
 SKALIBS_VERSION=v2.13.1.0
 SKALIBS_VERSION=v2.13.1.0
 
 
 # EXECLINE_VERSION=4676457df2c8a73b4f589a66315b9b137ee89202
 # EXECLINE_VERSION=4676457df2c8a73b4f589a66315b9b137ee89202
-EXECLINE_VERSION=v2.9.2.0
+EXECLINE_VERSION=v2.9.2.1
 
 
 # S6_VERSION=b4070f01c00a07d4f2df6a3ff85eb6f2b1386b84
 # S6_VERSION=b4070f01c00a07d4f2df6a3ff85eb6f2b1386b84
 S6_VERSION=v2.11.3.0
 S6_VERSION=v2.11.3.0
 
 
 # S6_RC_VERSION=58f93f6c710cc88acfa721a45efc1f64dfc557df
 # S6_RC_VERSION=58f93f6c710cc88acfa721a45efc1f64dfc557df
-S6_RC_VERSION=v0.5.4.0
+S6_RC_VERSION=v0.5.4.1
 
 
 # S6_LINUX_INIT_VERSION=b5ed0d1ef886d3c12345c22e6e42aa5fca272bb4
 # S6_LINUX_INIT_VERSION=b5ed0d1ef886d3c12345c22e6e42aa5fca272bb4
 S6_LINUX_INIT_VERSION=v1.1.0.0
 S6_LINUX_INIT_VERSION=v1.1.0.0
 
 
 # S6_PORTABLE_UTILS_VERSION=a80a1304ff86b8cf493265696d517aea2cf7a703
 # S6_PORTABLE_UTILS_VERSION=a80a1304ff86b8cf493265696d517aea2cf7a703
-S6_PORTABLE_UTILS_VERSION=v2.3.0.0
+S6_PORTABLE_UTILS_VERSION=v2.3.0.1
 
 
 # S6_LINUX_UTILS_VERSION=d983a8fe0a8efce4fbbf5fc53fc64e796b794fcb
 # S6_LINUX_UTILS_VERSION=d983a8fe0a8efce4fbbf5fc53fc64e796b794fcb
-S6_LINUX_UTILS_VERSION=v2.6.1.0
+S6_LINUX_UTILS_VERSION=v2.6.1.1
 
 
 # S6_DNS_VERSION=132f199d2e5561b5f9337201c2d991b513894c60
 # S6_DNS_VERSION=132f199d2e5561b5f9337201c2d991b513894c60
 S6_DNS_VERSION=v2.3.5.5
 S6_DNS_VERSION=v2.3.5.5