nodejs-npm has been split into nodejs and npm packages

.drone.yml

@@ -8,19 +8,13 @@ platform:
   arch: amd64
 
 steps:
-- name: build-0.30
+- name: build
   commands:
-  - docker build -t nephatrine/nginx-h5ai:0.30 .
-  - HOME=/mnt/config/home docker push nephatrine/nginx-h5ai:0.30
-- name: build-latest
-  commands:
-  - docker tag nephatrine/nginx-h5ai:0.30 pdr.nephatrine.net/nephatrine/nginx-h5ai:latest
+  - docker build -t pdr.nephatrine.net/nephatrine/nginx-h5ai:latest .
   - HOME=/mnt/config/home docker push pdr.nephatrine.net/nephatrine/nginx-h5ai:latest
   - docker tag pdr.nephatrine.net/nephatrine/nginx-h5ai:latest nephatrine/nginx-h5ai:latest
   - HOME=/mnt/config/home docker push nephatrine/nginx-h5ai:latest
   - docker rmi pdr.nephatrine.net/nephatrine/nginx-h5ai:latest
-  depends_on:
-  - build-0.30
 
 ---
 kind: pipeline
@@ -48,6 +42,6 @@ trigger:
 
 ---
 kind: signature
-hmac: 3b1a0278087689dcef3bac02f91eab061ce4136d2416a68380dbe65c2b665f7a
+hmac: d53f6e52d146a400e89eeeaba90381e62b308be30935d095c578013391aaf90b
 
 ...

.gitignore

@@ -1,2 +1,2 @@
-fix-perms.sh
+sign-build.sh
 test-build.sh

Dockerfile

@@ -1,24 +1,23 @@
 FROM nephatrine/nginx-php:latest
 LABEL maintainer="Daniel Wolf <nephatrine@gmail.com>"
 
-RUN echo "====== INSTALL PACKAGES ======" \
- && apk add ffmpeg imagemagick zip \
- && rm -rf /var/cache/apk/*
-
-ARG H5AI_VERSION=v0.30.0
-
+ARG H5AI_VERSION=0.31.0
 RUN echo "====== COMPILE H5AI ======" \
- && apk add --virtual .build-h5ai git nodejs-npm \
- && git -C /usr/src clone -b "$H5AI_VERSION" --single-branch --depth=1 https://github.com/lrsjng/h5ai.git && cd /usr/src/h5ai \
+ && apk add \
+  ffmpeg \
+  imagemagick \
+  zip \
+ && apk add --virtual .build-h5ai \
+  git \
+  npm \
+ && git -C /usr/src clone -b "$H5AI_VERSION" https://github.com/glubsy/h5ai.git && cd /usr/src/h5ai \
  && npm install \
  && npm run build \
  && unzip build/*.zip -d /var/www/html/ \
+ && mkdir -p /mnt/media \
+ && sed -i 's~index.html~index.html /_h5ai/public/index.php~g' /etc/nginx/nginx.conf \
+ && sed -i 's~/mnt/config/www/~/mnt/config/www/:/mnt/media/~g' /etc/php/php-fpm.d/www.conf \
  && cd /usr/src && rm -rf /usr/src/* \
  && apk del --purge .build-h5ai && rm -rf /var/cache/apk/*
 
-RUN echo "====== CONFIGURE SYSTEM ======" \
- && mkdir -p /mnt/media \
- && sed -i 's~index.html~index.html /_h5ai/public/index.php~g' /etc/nginx/nginx.conf \
- && sed -i 's~/mnt/config/www/~/mnt/config/www/:/mnt/media/~g' /etc/php/php-fpm.d/www.conf
-
-COPY override /
+COPY override /

README.md

@@ -1,4 +1,4 @@
-[Git](https://code.nephatrine.net/nephatrine/docker-nginx-h5ai) |
+[Git](https://code.nephatrine.net/nephatrine/docker-nginx-h5ai/src/branch/master) |
 [Docker](https://hub.docker.com/r/nephatrine/nginx-h5ai/) |
 [unRAID](https://code.nephatrine.net/nephatrine/unraid-containers)
 
@@ -19,6 +19,10 @@ the [nginx-ssl](https://hub.docker.com/r/nephatrine/nginx-ssl/) container. If
 part of a larger envinronment, we suggest using a separate container as a
 reverse proxy server and handle TLS there rather than here.
 
+- [Alpine Linux](https://alpinelinux.org/)
+- [Skarnet Software](https://skarnet.org/software/)
+- [S6 Overlay](https://github.com/just-containers/s6-overlay)
+- [CertBot](https://certbot.eff.org/)
 - [NGINX](https://www.nginx.com/)
 - [PHP](https://www.php.net/)
 - [H5AI](https://larsjung.de/h5ai/)
@@ -36,9 +40,8 @@ applications.
 
 ## Docker Tags
 
-- **nephatrine/nginx-h5ai:testing**: H5AI Master
-- **nephatrine/nginx-h5ai:latest**: H5AI 0.30.0
-- **nephatrine/nginx-h5ai:0.30**: H5AI 0.30.0
+- **nephatrine/nginx-h5ai:testing**: H5AI 0.31.0-glubsy / PHP 8 / NGINX Mainline / Alpine Edge
+- **nephatrine/nginx-h5ai:latest**: H5AI 0.31.0-glubsy / PHP 8 / NGINX Mainline / Alpine Latest
 
 ## Configuration Variables