Skip to content

Commit d59065f

Browse files
committed
Now based on Alpine Linux with s6 overlay
1 parent 0e995ff commit d59065f

File tree

5 files changed

+5
-40
lines changed

5 files changed

+5
-40
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
run: |
2828
DOCKER_USERNAME=crazymax
2929
DOCKER_IMAGE=crazymax/nextcloud
30-
DOCKER_PLATFORMS=linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le
30+
DOCKER_PLATFORMS=linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le,linux/s390x
3131
DOCKER_FILE=Dockerfile-19
3232
VERSION=edge
3333
LATEST=$(cat .latest)

Dockerfile-17

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.10
1+
FROM --platform=${TARGETPLATFORM:-linux/amd64} crazymax/alpine-s6:3.11
22

33
ARG BUILD_DATE
44
ARG VCS_REF
@@ -85,18 +85,6 @@ RUN apk --update --no-cache add \
8585
&& cd /tmp \
8686
&& wget -q https://pecl.php.net/get/smbclient-1.0.0.tgz \
8787
&& pecl install smbclient-1.0.0.tgz \
88-
&& S6_ARCH=$(case ${TARGETPLATFORM:-linux/amd64} in \
89-
"linux/amd64") echo "amd64" ;; \
90-
"linux/arm/v6") echo "arm" ;; \
91-
"linux/arm/v7") echo "armhf" ;; \
92-
"linux/arm64") echo "aarch64" ;; \
93-
"linux/386") echo "x86" ;; \
94-
"linux/ppc64le") echo "ppc64le" ;; \
95-
*) echo "" ;; esac) \
96-
&& echo "S6_ARCH=$S6_ARCH" \
97-
&& wget -q "https://github.com/just-containers/s6-overlay/releases/latest/download/s6-overlay-${S6_ARCH}.tar.gz" -qO "/tmp/s6-overlay-${S6_ARCH}.tar.gz" \
98-
&& tar xzf /tmp/s6-overlay-${S6_ARCH}.tar.gz -C / \
99-
&& s6-echo "s6-overlay installed" \
10088
&& apk del build-dependencies \
10189
&& rm -rf /tmp/* /var/cache/apk/* /var/www/*
10290

Dockerfile-18

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.11
1+
FROM --platform=${TARGETPLATFORM:-linux/amd64} crazymax/alpine-s6:3.11
22

33
ARG BUILD_DATE
44
ARG VCS_REF
@@ -85,18 +85,6 @@ RUN apk --update --no-cache add \
8585
&& cd /tmp \
8686
&& wget -q https://pecl.php.net/get/smbclient-1.0.0.tgz \
8787
&& pecl install smbclient-1.0.0.tgz \
88-
&& S6_ARCH=$(case ${TARGETPLATFORM:-linux/amd64} in \
89-
"linux/amd64") echo "amd64" ;; \
90-
"linux/arm/v6") echo "arm" ;; \
91-
"linux/arm/v7") echo "armhf" ;; \
92-
"linux/arm64") echo "aarch64" ;; \
93-
"linux/386") echo "x86" ;; \
94-
"linux/ppc64le") echo "ppc64le" ;; \
95-
*) echo "" ;; esac) \
96-
&& echo "S6_ARCH=$S6_ARCH" \
97-
&& wget -q "https://github.com/just-containers/s6-overlay/releases/latest/download/s6-overlay-${S6_ARCH}.tar.gz" -qO "/tmp/s6-overlay-${S6_ARCH}.tar.gz" \
98-
&& tar xzf /tmp/s6-overlay-${S6_ARCH}.tar.gz -C / \
99-
&& s6-echo "s6-overlay installed" \
10088
&& apk del build-dependencies \
10189
&& rm -rf /tmp/* /var/cache/apk/* /var/www/*
10290

Dockerfile-19

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.12
1+
FROM --platform=${TARGETPLATFORM:-linux/amd64} crazymax/alpine-s6:3.12
22

33
ARG BUILD_DATE
44
ARG VCS_REF
@@ -86,18 +86,6 @@ RUN apk --update --no-cache add \
8686
&& cd /tmp \
8787
&& wget -q https://pecl.php.net/get/smbclient-1.0.0.tgz \
8888
&& pecl install smbclient-1.0.0.tgz \
89-
&& S6_ARCH=$(case ${TARGETPLATFORM:-linux/amd64} in \
90-
"linux/amd64") echo "amd64" ;; \
91-
"linux/arm/v6") echo "arm" ;; \
92-
"linux/arm/v7") echo "armhf" ;; \
93-
"linux/arm64") echo "aarch64" ;; \
94-
"linux/386") echo "x86" ;; \
95-
"linux/ppc64le") echo "ppc64le" ;; \
96-
*) echo "" ;; esac) \
97-
&& echo "S6_ARCH=$S6_ARCH" \
98-
&& wget -q "https://github.com/just-containers/s6-overlay/releases/latest/download/s6-overlay-${S6_ARCH}.tar.gz" -qO "/tmp/s6-overlay-${S6_ARCH}.tar.gz" \
99-
&& tar xzf /tmp/s6-overlay-${S6_ARCH}.tar.gz -C / \
100-
&& s6-echo "s6-overlay installed" \
10189
&& apk del build-dependencies \
10290
&& rm -rf /tmp/* /var/cache/apk/* /var/www/*
10391

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ Image: crazymax/nextcloud:latest
8080
- linux/arm64
8181
- linux/386
8282
- linux/ppc64le
83+
- linux/s390x
8384
```
8485

8586
## Environment variables

0 commit comments

Comments
 (0)