Compare commits
3 Commits
e8857348a6
...
95b27ab1bb
Author | SHA1 | Date |
---|---|---|
chris | 95b27ab1bb | |
chris | c0378c172f | |
chris | 032e0a4820 |
|
@ -1,10 +1,10 @@
|
|||
ARG VERSION=3.16.2
|
||||
ARG VERSION=3.17.0
|
||||
|
||||
FROM alpine as build
|
||||
ARG VERSION
|
||||
ENV VERSION $VERSION
|
||||
|
||||
ENV ALPINE_SERIES 3.16
|
||||
ENV ALPINE_SERIES 3.17
|
||||
ENV ALPINE_MIRROR https://ftp.halifax.rwth-aachen.de/alpine/v${ALPINE_SERIES}
|
||||
ENV ALPINE_ARCH x86_64
|
||||
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
FROM reg.zknt.org/zknt/alpine:3.16
|
||||
FROM reg.zknt.org/zknt/alpine:3.17
|
||||
|
||||
COPY dumb-init_1.2.5_x86_64 /usr/local/sbin/dumb-init
|
||||
RUN apk add --no-cache apache2-proxy php8-fpm && \
|
||||
RUN apk add --no-cache apache2-proxy php81-fpm && \
|
||||
mkdir -p /var/www/html && \
|
||||
mkdir -p /usr/local/sbin && \
|
||||
mkdir -p /run/apache2 &&\
|
||||
chmod +x /usr/local/sbin/dumb-init
|
||||
COPY httpd.conf /etc/apache2/httpd.conf
|
||||
COPY zzzuser.conf /etc/php8/php-fpm.d/zzzuser.conf
|
||||
COPY zzzuser.conf /etc/php81/php-fpm.d/zzzuser.conf
|
||||
EXPOSE 80
|
||||
ENTRYPOINT php-fpm8; /usr/local/sbin/dumb-init httpd -DFOREGROUND
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
FROM reg.zknt.org/zknt/alpine:3.16
|
||||
FROM reg.zknt.org/zknt/alpine:3.17
|
||||
|
||||
ARG NODE_VERSION 16
|
||||
ARG NODE_VERSION=18
|
||||
|
||||
RUN set -xe;\
|
||||
apk update &&\
|
||||
apk add $(apk search nodejs- | grep nodejs-16 | sed -e 's#js-#js=#') yarn &&\
|
||||
apk add $(apk search nodejs- | grep nodejs-${NODE_VERSION} | sed -e 's#js-#js=#') yarn &&\
|
||||
rm /var/cache/apk/*
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM reg.zknt.org/zknt/node:16
|
||||
FROM reg.zknt.org/zknt/node:18
|
||||
|
||||
ENV VERSION v2.3.2
|
||||
|
||||
|
|
Loading…
Reference in New Issue