Skip to content

Commit

Permalink
Upgrade s6-overlay to 3.2.0.0 version
Browse files Browse the repository at this point in the history
  • Loading branch information
tyranron committed Jun 10, 2024
1 parent 923d340 commit 863be0d
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 18 deletions.
5 changes: 3 additions & 2 deletions 1.5/apache/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
FROM php:8.2-apache

ARG roundcube_ver=1.5.7
ARG s6_overlay_ver=3.1.6.2
ARG s6_overlay_ver=3.2.0.0


# Install s6-overlay
Expand All @@ -19,7 +19,8 @@ RUN curl -fL -o /tmp/s6-overlay-noarch.tar.xz \

ENV S6_KEEP_ENV=1 \
S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \
S6_CMD_WAIT_FOR_SERVICES=1
S6_CMD_WAIT_FOR_SERVICES=1 \
S6_CMD_WAIT_FOR_SERVICES_MAXTIME=5000


# Install required libraries and PHP extensions
Expand Down
5 changes: 3 additions & 2 deletions 1.5/fpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
FROM php:8.2-fpm-alpine3.20

ARG roundcube_ver=1.5.7
ARG s6_overlay_ver=3.1.6.2
ARG s6_overlay_ver=3.2.0.0


# Install s6-overlay
Expand All @@ -19,7 +19,8 @@ RUN curl -fL -o /tmp/s6-overlay-noarch.tar.xz \

ENV S6_KEEP_ENV=1 \
S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \
S6_CMD_WAIT_FOR_SERVICES=1
S6_CMD_WAIT_FOR_SERVICES=1 \
S6_CMD_WAIT_FOR_SERVICES_MAXTIME=5000


# Install required libraries and PHP extensions
Expand Down
5 changes: 3 additions & 2 deletions 1.6/apache/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
FROM php:8.2-apache

ARG roundcube_ver=1.6.7
ARG s6_overlay_ver=3.1.6.2
ARG s6_overlay_ver=3.2.0.0


# Install s6-overlay
Expand All @@ -19,7 +19,8 @@ RUN curl -fL -o /tmp/s6-overlay-noarch.tar.xz \

ENV S6_KEEP_ENV=1 \
S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \
S6_CMD_WAIT_FOR_SERVICES=1
S6_CMD_WAIT_FOR_SERVICES=1 \
S6_CMD_WAIT_FOR_SERVICES_MAXTIME=5000


# Install required libraries and PHP extensions
Expand Down
5 changes: 3 additions & 2 deletions 1.6/fpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
FROM php:8.2-fpm-alpine3.20

ARG roundcube_ver=1.6.7
ARG s6_overlay_ver=3.1.6.2
ARG s6_overlay_ver=3.2.0.0


# Install s6-overlay
Expand All @@ -19,7 +19,8 @@ RUN curl -fL -o /tmp/s6-overlay-noarch.tar.xz \

ENV S6_KEEP_ENV=1 \
S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \
S6_CMD_WAIT_FOR_SERVICES=1
S6_CMD_WAIT_FOR_SERVICES=1 \
S6_CMD_WAIT_FOR_SERVICES_MAXTIME=5000


# Install required libraries and PHP extensions
Expand Down
24 changes: 24 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,30 @@ All user visible changes to this project will be documented in this file. This p



## [1.6.7-r2] · 2024-06-10
[1.6.7-r2]: /../../tree/1.6.7-r2

[Diff](/../../compare/1.6.7-r1...1.6.7-r2)

### Upgraded

- [s6-overlay] 3.2.0.0: <https://github.com/just-containers/s6-overlay/releases/tag/v3.2.0.0>




## [1.5.7-r2] · 2024-06-10
[1.5.7-r2]: /../../tree/1.5.7-r2

[Diff](/../../compare/1.5.7-r1...1.5.7-r2)

### Upgraded

- [s6-overlay] 3.2.0.0: <https://github.com/just-containers/s6-overlay/releases/tag/v3.2.0.0>




## [1.6.7-r1] · 2024-05-24
[1.6.7-r1]: /../../tree/1.6.7-r1

Expand Down
5 changes: 3 additions & 2 deletions Dockerfile.tmpl.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<? } ?>

ARG roundcube_ver=<?= $RoundcubeVer."\n"; ?>
ARG s6_overlay_ver=3.1.6.2
ARG s6_overlay_ver=3.2.0.0


# Install s6-overlay
Expand All @@ -31,7 +31,8 @@

ENV S6_KEEP_ENV=1 \
S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \
S6_CMD_WAIT_FOR_SERVICES=1
S6_CMD_WAIT_FOR_SERVICES=1 \
S6_CMD_WAIT_FOR_SERVICES_MAXTIME=5000


# Install required libraries and PHP extensions
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ REGISTRIES := $(strip $(subst $(comma), ,\
$(shell grep -m1 'registry: \["' .github/workflows/ci.yml \
| cut -d':' -f2 | tr -d '"][')))
ALL_IMAGES := \
1.6/apache:1.6.7-r1-apache,1.6.7-apache,1.6-apache,1-apache,apache,latest \
1.6/fpm:1.6.7-r1-fpm,1.6.7-fpm,1.6-fpm,1-fpm,fpm \
1.5/apache:1.5.7-r1-apache,1.5.7-apache,1.5-apache \
1.5/fpm:1.5.7-r1-fpm,1.5.7-fpm,1.5-fpm
1.6/apache:1.6.7-r2-apache,1.6.7-apache,1.6-apache,1-apache,apache,latest \
1.6/fpm:1.6.7-r2-fpm,1.6.7-fpm,1.6-fpm,1-fpm,fpm \
1.5/apache:1.5.7-r2-apache,1.5.7-apache,1.5-apache \
1.5/fpm:1.5.7-r2-fpm,1.5.7-fpm,1.5-fpm
# <Dockerfile>:<version>,<tag1>,<tag2>,...

# Default is first image from ALL_IMAGES list.
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ Roundcube Webmail Docker image

## Supported tags and respective `Dockerfile` links

- [`1.6.7-r1-apache`, `1.6.7-apache`, `1.6-apache`, `1-apache`, `apache`, `latest`][101]
- [`1.6.7-r1-fpm`, `1.6.7-fpm`, `1.6-fpm`, `1-fpm`, `fpm`][102]
- [`1.5.7-r1-apache`, `1.5.7-apache`, `1.5-apache`][103]
- [`1.5.7-r1-fpm`, `1.5.7-fpm`, `1.5-fpm`][104]
- [`1.6.7-r2-apache`, `1.6.7-apache`, `1.6-apache`, `1-apache`, `apache`, `latest`][101]
- [`1.6.7-r2-fpm`, `1.6.7-fpm`, `1.6-fpm`, `1-fpm`, `fpm`][102]
- [`1.5.7-r2-apache`, `1.5.7-apache`, `1.5-apache`][103]
- [`1.5.7-r2-fpm`, `1.5.7-fpm`, `1.5-fpm`][104]



Expand Down

0 comments on commit 863be0d

Please sign in to comment.