1
0
mirror of https://github.com/x86dev/docker-ttrss synced 2025-12-11 08:56:01 +00:00

More build fixes; upgraded to PHP 8.1. We stay on an old(er) version of s6 now, as this needs more work first.

This commit is contained in:
x86dev
2023-10-26 21:49:33 +02:00
parent d2f5a5ae08
commit a1cc7716a8
7 changed files with 14 additions and 29 deletions

View File

@@ -1,6 +1,6 @@
# Using https://github.com/gliderlabs/docker-alpine,
# plus https://github.com/just-containers/s6-overlay for a s6 Docker overlay.
FROM alpine:latest
FROM docker.io/alpine:3 AS builder
# Initially was based on work of Christian Lück <christian@lueck.tv>.
LABEL description="A complete, self-hosted Tiny Tiny RSS (TTRSS) environment." \
maintainer="Andreas Löffler <andy@x86dev.com>"
@@ -9,11 +9,12 @@ RUN set -xe && \
apk update && apk upgrade && \
apk add --no-cache --virtual=run-deps \
busybox nginx git ca-certificates curl \
php7 php7-fpm php7-curl php7-dom php7-gd php7-iconv php7-fileinfo php7-json \
php7-mcrypt php7-pgsql php7-pcntl php7-pdo php7-pdo_pgsql \
php7-mysqli php7-pdo_mysql \
php7-mbstring php7-posix php7-session php7-intl \
tar
php81 php81-fpm php81-phar \
php81-pdo php81-gd php81-pgsql php81-pdo_pgsql php81-xmlwriter \
php81-mbstring php81-intl php81-xml php81-curl php81-simplexml \
php81-session php81-tokenizer php81-dom php81-fileinfo php81-ctype \
php81-json php81-iconv php81-pcntl php81-posix php81-zip php81-exif php81-openssl \
tar xz
# Add user www-data for php-fpm.
# 82 is the standard uid/gid for "www-data" in Alpine.
@@ -23,8 +24,11 @@ RUN adduser -u 82 -D -S -G www-data www-data
COPY root /
# Add s6 overlay.
#ARG S6_OVERLAY_VERSION=3.1.5.0
#RUN curl -L -s https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz | tar -Jxpf - -C /
# Note: Tweak this line if you're running anything other than x86 AMD64 (64-bit).
RUN curl -L -s https://github.com/just-containers/s6-overlay/releases/download/v3.1.2.1/s6-overlay-x86_64.tar.xz | tar xvJf - -C /
#RUN curl -L -s https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz | tar -Jxpf - -C /
RUN curl -L -s https://github.com/just-containers/s6-overlay/releases/download/v1.19.1.1/s6-overlay-amd64.tar.gz | tar xvzf - -C /
# Add wait-for-it.sh
ADD https://raw.githubusercontent.com/Eficode/wait-for/master/wait-for /srv