Skip to content

Commit

Permalink
Update to newest s6-overlay-helpers as well; v3.1.0.1
Browse files Browse the repository at this point in the history
Signed-off-by: Laurent Bercot <[email protected]>
  • Loading branch information
skarnet committed Mar 8, 2022
1 parent 69ea618 commit 794f70f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Build the following Dockerfile and try it out:
```
# Use your favorite image
FROM ubuntu
ARG S6_OVERLAY_VERSION=3.1.0.0
ARG S6_OVERLAY_VERSION=3.1.0.1
RUN apt-get update && apt-get install -y nginx xz-utils
RUN echo "daemon off;" >> /etc/nginx/nginx.conf
Expand Down Expand Up @@ -210,9 +210,9 @@ To install those tarballs, add lines to your Dockerfile that correspond
to the functionality you want to install. For instance, most people would
use the following:
```
ADD https://github.com/just-containers/s6-overlay/releases/download/v3.1.0.0/s6-overlay-noarch.tar.xz /tmp
ADD https://github.com/just-containers/s6-overlay/releases/download/v3.1.0.1/s6-overlay-noarch.tar.xz /tmp
RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz
ADD https://github.com/just-containers/s6-overlay/releases/download/v3.1.0.0/s6-overlay-x86_64.tar.xz /tmp
ADD https://github.com/just-containers/s6-overlay/releases/download/v3.1.0.1/s6-overlay-x86_64.tar.xz /tmp
RUN tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz
```

Expand Down Expand Up @@ -249,9 +249,9 @@ For example:

```
FROM busybox
ADD https://github.com/just-containers/s6-overlay/releases/download/v3.1.0.0/s6-overlay-noarch.tar.xz /tmp
ADD https://github.com/just-containers/s6-overlay/releases/download/v3.1.0.1/s6-overlay-noarch.tar.xz /tmp
RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz
ADD https://github.com/just-containers/s6-overlay/releases/download/v3.1.0.0/s6-overlay-x86_64.tar.xz /tmp
ADD https://github.com/just-containers/s6-overlay/releases/download/v3.1.0.1/s6-overlay-x86_64.tar.xz /tmp
RUN tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz
ENTRYPOINT ["/init"]
```
Expand Down Expand Up @@ -810,7 +810,7 @@ RUN cd /tmp && sha256sum -c *.sha256

### `USER` directive

As of version 3.1.0.0, s6-overlay has limited support for running as a user other than `root`:
As of version 3.1.0.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
on being able to change UIDs).
Expand Down
2 changes: 1 addition & 1 deletion conf/defaults.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# e.g.: make SHEBANGDIR=/usr/bin VERSION=3.0.0.1

# The version of the software being built.
VERSION := 3.1.0.0
VERSION := 3.1.0.1

# Where stuff is going to be built. Change for out-of-tree builds.
OUTPUT := output
Expand Down
2 changes: 1 addition & 1 deletion conf/versions
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ S6_DNS_VERSION=v2.3.5.3
S6_NETWORKING_VERSION=v2.5.1.0

# S6_OVERLAY_HELPERS_VERSION=ec2ca4c650928a64de31dbbe589e0be0e452c992
S6_OVERLAY_HELPERS_VERSION=v0.0.1.0
S6_OVERLAY_HELPERS_VERSION=v0.1.0.0

0 comments on commit 794f70f

Please sign in to comment.