mirror of
https://github.com/linuxserver/docker-cops.git
synced 2026-02-19 18:51:05 +08:00
Merge pull request #37 from linuxserver/3.17
Rebase to alpine 3.17 with php8.1
This commit is contained in:
commit
ae0decd8e4
12
.github/workflows/call_invalid_helper.yml
vendored
Normal file
12
.github/workflows/call_invalid_helper.yml
vendored
Normal file
@ -0,0 +1,12 @@
|
||||
name: Comment on invalid interaction
|
||||
on:
|
||||
issues:
|
||||
types:
|
||||
- labeled
|
||||
jobs:
|
||||
add-comment-on-invalid:
|
||||
if: github.event.label.name == 'invalid'
|
||||
permissions:
|
||||
issues: write
|
||||
uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1
|
||||
secrets: inherit
|
||||
32
Dockerfile
32
Dockerfile
@ -1,4 +1,6 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.15
|
||||
# syntax=docker/dockerfile:1
|
||||
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.17
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@ -8,23 +10,19 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
|
||||
LABEL maintainer="chbmb"
|
||||
|
||||
RUN \
|
||||
echo "**** install build packages ****" && \
|
||||
apk add --no-cache --upgrade --virtual=build-dependencies \
|
||||
curl \
|
||||
tar && \
|
||||
echo "**** install runtime packages ****" && \
|
||||
apk add --no-cache --upgrade \
|
||||
php8-ctype \
|
||||
php8-dom \
|
||||
php8-gd \
|
||||
php8-intl \
|
||||
php8-mbstring \
|
||||
php8-opcache \
|
||||
php8-openssl \
|
||||
php8-phar \
|
||||
php8-pdo_sqlite \
|
||||
php8-zip \
|
||||
php8-zlib && \
|
||||
php81-ctype \
|
||||
php81-dom \
|
||||
php81-gd \
|
||||
php81-intl \
|
||||
php81-mbstring \
|
||||
php81-opcache \
|
||||
php81-openssl \
|
||||
php81-phar \
|
||||
php81-pdo_sqlite \
|
||||
php81-zip \
|
||||
php81-zlib && \
|
||||
echo "**** install cops ****" && \
|
||||
curl \
|
||||
-sS https://getcomposer.org/installer \
|
||||
@ -47,8 +45,6 @@ RUN \
|
||||
install --no-dev --optimize-autoloader && \
|
||||
sed -i 's|^[[:space:]]*return[[:space:]]@create_function[[:space:]]'\(''\''\$it'\'',[[:space:]]\$func'\)';| return function \(\$it\) use \(\$func\) \{\n return eval\(\$func\);\n \};|' vendor/seblucas/dot-php/doT.php && \
|
||||
echo "**** cleanup ****" && \
|
||||
apk del --purge \
|
||||
build-dependencies && \
|
||||
rm -rf \
|
||||
/root/.composer \
|
||||
/tmp/*
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.15
|
||||
# syntax=docker/dockerfile:1
|
||||
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.17
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@ -8,23 +10,19 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
|
||||
LABEL maintainer="chbmb"
|
||||
|
||||
RUN \
|
||||
echo "**** install build packages ****" && \
|
||||
apk add --no-cache --upgrade --virtual=build-dependencies \
|
||||
curl \
|
||||
tar && \
|
||||
echo "**** install runtime packages ****" && \
|
||||
apk add --no-cache --upgrade \
|
||||
php8-ctype \
|
||||
php8-dom \
|
||||
php8-gd \
|
||||
php8-intl \
|
||||
php8-mbstring \
|
||||
php8-opcache \
|
||||
php8-openssl \
|
||||
php8-phar \
|
||||
php8-pdo_sqlite \
|
||||
php8-zip \
|
||||
php8-zlib && \
|
||||
php81-ctype \
|
||||
php81-dom \
|
||||
php81-gd \
|
||||
php81-intl \
|
||||
php81-mbstring \
|
||||
php81-opcache \
|
||||
php81-openssl \
|
||||
php81-phar \
|
||||
php81-pdo_sqlite \
|
||||
php81-zip \
|
||||
php81-zlib && \
|
||||
echo "**** install cops ****" && \
|
||||
curl \
|
||||
-sS https://getcomposer.org/installer \
|
||||
@ -47,8 +45,6 @@ RUN \
|
||||
install --no-dev --optimize-autoloader && \
|
||||
sed -i 's|^[[:space:]]*return[[:space:]]@create_function[[:space:]]'\(''\''\$it'\'',[[:space:]]\$func'\)';| return function \(\$it\) use \(\$func\) \{\n return eval\(\$func\);\n \};|' vendor/seblucas/dot-php/doT.php && \
|
||||
echo "**** cleanup ****" && \
|
||||
apk del --purge \
|
||||
build-dependencies && \
|
||||
rm -rf \
|
||||
/root/.composer \
|
||||
/tmp/*
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.15
|
||||
# syntax=docker/dockerfile:1
|
||||
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.17
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@ -8,23 +10,19 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
|
||||
LABEL maintainer="chbmb"
|
||||
|
||||
RUN \
|
||||
echo "**** install build packages ****" && \
|
||||
apk add --no-cache --upgrade --virtual=build-dependencies \
|
||||
curl \
|
||||
tar && \
|
||||
echo "**** install runtime packages ****" && \
|
||||
apk add --no-cache --upgrade \
|
||||
php8-ctype \
|
||||
php8-dom \
|
||||
php8-gd \
|
||||
php8-intl \
|
||||
php8-mbstring \
|
||||
php8-opcache \
|
||||
php8-openssl \
|
||||
php8-phar \
|
||||
php8-pdo_sqlite \
|
||||
php8-zip \
|
||||
php8-zlib && \
|
||||
php81-ctype \
|
||||
php81-dom \
|
||||
php81-gd \
|
||||
php81-intl \
|
||||
php81-mbstring \
|
||||
php81-opcache \
|
||||
php81-openssl \
|
||||
php81-phar \
|
||||
php81-pdo_sqlite \
|
||||
php81-zip \
|
||||
php81-zlib && \
|
||||
echo "**** install cops ****" && \
|
||||
curl \
|
||||
-sS https://getcomposer.org/installer \
|
||||
@ -47,8 +45,6 @@ RUN \
|
||||
install --no-dev --optimize-autoloader && \
|
||||
sed -i 's|^[[:space:]]*return[[:space:]]@create_function[[:space:]]'\(''\''\$it'\'',[[:space:]]\$func'\)';| return function \(\$it\) use \(\$func\) \{\n return eval\(\$func\);\n \};|' vendor/seblucas/dot-php/doT.php && \
|
||||
echo "**** cleanup ****" && \
|
||||
apk del --purge \
|
||||
build-dependencies && \
|
||||
rm -rf \
|
||||
/root/.composer \
|
||||
/tmp/*
|
||||
|
||||
@ -257,6 +257,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
||||
|
||||
## Versions
|
||||
|
||||
* **19.01.23:** - Rebase to alpine 3.17 with php8.1.
|
||||
* **20.08.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).
|
||||
* **22.11.20:** - Pin composer version to 1.10.17.
|
||||
* **01.06.20:** - Rebasing to alpine 3.12.
|
||||
|
||||
@ -84,6 +84,7 @@ app_setup_block: |
|
||||
|
||||
# changelog
|
||||
changelogs:
|
||||
- { date: "19.01.23:", desc: "Rebase to alpine 3.17 with php8.1." }
|
||||
- { date: "20.08.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." }
|
||||
- { date: "22.11.20:", desc: "Pin composer version to 1.10.17." }
|
||||
- { date: "01.06.20:", desc: "Rebasing to alpine 3.12." }
|
||||
|
||||
7
root/etc/cont-init.d/40-config → root/etc/s6-overlay/s6-rc.d/init-cops-config/run
Normal file → Executable file
7
root/etc/cont-init.d/40-config → root/etc/s6-overlay/s6-rc.d/init-cops-config/run
Normal file → Executable file
@ -22,7 +22,6 @@ for f in /config/config_local*.php; do
|
||||
cp "$f" /app/www/public/
|
||||
done
|
||||
|
||||
# permissions
|
||||
chown -R abc:abc \
|
||||
/config \
|
||||
/app/www/public
|
||||
# permissions
|
||||
lsiown -R abc:abc \
|
||||
/config
|
||||
1
root/etc/s6-overlay/s6-rc.d/init-cops-config/type
Normal file
1
root/etc/s6-overlay/s6-rc.d/init-cops-config/type
Normal file
@ -0,0 +1 @@
|
||||
oneshot
|
||||
1
root/etc/s6-overlay/s6-rc.d/init-cops-config/up
Normal file
1
root/etc/s6-overlay/s6-rc.d/init-cops-config/up
Normal file
@ -0,0 +1 @@
|
||||
/etc/s6-overlay/s6-rc.d/init-cops-config/run
|
||||
Loading…
x
Reference in New Issue
Block a user