update to last release

.github/workflows/buildx.yml

@@ -0,0 +1,30 @@
+name: buildx
+on:
+  push:
+    branches:
+      - master
+jobs:
+  buildx:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+        with:
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/h5ai:latest
+          push: true

.gitlab-ci.yml

@@ -1,102 +1,87 @@
 image: docker:git
 
 services:
-  - docker:dind
+- docker:dind
 
 stages:
-  - build_image
-  - tag_latest
+- build_image
 
 before_script:
-  - docker login -u "${CI_REGISTRY_USER}" -p "${CI_JOB_TOKEN}" "${CI_REGISTRY}"
+- docker login -u "${CI_REGISTRY_USER}" -p "${CI_JOB_TOKEN}" "${CI_REGISTRY}"
 
-###
-## BUILD IMAGE
-#
-# Default branches (master/dev)
 build_image.default:
   stage: build_image
   script:
-    - docker build --pull
-      --build-arg BUILD_NAME="${CI_PROJECT_NAME}"
-      --build-arg BUILD_DATE="$(date '+%FT%T.%s%z')"
-      --build-arg BUILD_VCSREF="${CI_COMMIT_SHA:0:8}"
-      -t "${CI_REGISTRY_IMAGE}:branch-${CI_COMMIT_REF_NAME}" .
-    - docker push "${CI_REGISTRY_IMAGE}:branch-${CI_COMMIT_REF_NAME}"
+  - docker buildx create --driver docker-container --use
+  - docker buildx build
+    --provenance=false
+    --pull
+    --build-arg BUILD_NAME="${CI_PROJECT_NAME}"
+    --build-arg BUILD_DATE="$(date '+%FT%T.%s%z')"
+    --build-arg BUILD_VCSREF="${CI_COMMIT_SHA:0:8}"
+    --platform=linux/arm64,linux/amd64,linux/arm/v7
+    --push
+    -t "${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}"
+    .
   only:
-    - master
-    - dev
+  - master
   except:
-    - tags
-  tags:
-    - tractor
+  - tags
 
-# Issue branches (^[0-9]+-.*])
-# Strip branch name branch ID
 build_image.feature:
   stage: build_image
   script:
-    - docker build --pull
-      --build-arg BUILD_NAME="${CI_PROJECT_NAME}"
-      --build-arg BUILD_DATE="$(date '+%FT%T.%s%z')"
-      --build-arg BUILD_VCSREF="${CI_COMMIT_SHA:0:8}"
-      -t "${CI_REGISTRY_IMAGE}:branch-${CI_COMMIT_REF_NAME%%-*}" .
-    - docker push "${CI_REGISTRY_IMAGE}:branch-${CI_COMMIT_REF_NAME%%-*}"
+  - docker buildx create --driver docker-container --use
+  - docker buildx build
+    --provenance=false
+    --pull
+    --build-arg BUILD_NAME="${CI_PROJECT_NAME}"
+    --build-arg BUILD_DATE="$(date '+%FT%T.%s%z')"
+    --build-arg BUILD_VCSREF="${CI_COMMIT_SHA:0:8}"
+    --platform=linux/arm64,linux/amd64,linux/arm/v7
+    --push
+    -t "${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME%%-*}"
+    .
   only:
-    - /^[0-9]+-.*$/
+  - "/^[0-9]+-.*$/"
   except:
-    - tags
-  tags:
-    - tractor
+  - tags
 
-# Non Standard branches (^[a-zA-Z]+.*)
-# Strip branch name to 128 char max
 build_image.nonstd:
   stage: build_image
   script:
-    - docker build --pull
-      --build-arg BUILD_NAME="${CI_PROJECT_NAME}"
-      --build-arg BUILD_DATE="$(date '+%FT%T.%s%z')"
-      --build-arg BUILD_VCSREF="${CI_COMMIT_SHA:0:8}"
-      -t "${CI_REGISTRY_IMAGE}:branch-${CI_COMMIT_REF_NAME:0:128}" .
-    - docker push "${CI_REGISTRY_IMAGE}:branch-${CI_COMMIT_REF_NAME:0:128}"
+  - docker buildx create --driver docker-container --use
+  - docker buildx build
+    --provenance=false
+    --pull
+    --build-arg BUILD_NAME="${CI_PROJECT_NAME}"
+    --build-arg BUILD_DATE="$(date '+%FT%T.%s%z')"
+    --build-arg BUILD_VCSREF="${CI_COMMIT_SHA:0:8}"
+    --platform=linux/arm64,linux/amd64,linux/arm/v7
+    --push
+    -t "${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME:0:128}"
+    .
   only:
-    - /^[a-zA-Z]+.*$/
+  - "/^[a-zA-Z]+.*$/"
   except:
-    - master
-    - dev
-    - tags
-  tags:
-    - tractor
+  - master
+  - dev
+  - tags
 
-# TAGS
 build_image.tag:
   stage: build_image
   script:
-    - docker build --pull
-      --build-arg BUILD_NAME="${CI_PROJECT_NAME}"
-      --build-arg BUILD_DATE="$(date '+%FT%T.%s%z')"
-      --build-arg BUILD_VCSREF="${CI_COMMIT_REF_NAME}"
-      -t "${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}" .
-    - docker push "${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}"
+  - docker buildx create --driver docker-container --use
+  - docker buildx build
+    --provenance=false
+    --pull
+    --build-arg BUILD_NAME="${CI_PROJECT_NAME}"
+    --build-arg BUILD_DATE="$(date '+%FT%T.%s%z')"
+    --build-arg BUILD_VCSREF="${CI_COMMIT_SHA:0:8}"
+    --platform=linux/arm64,linux/amd64,linux/arm/v7
+    --push
+    -t "${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}"
+    -t "${CI_REGISTRY_IMAGE}:latest"
+    .
   only:
-    - tags
-  tags:
-    - tractor
-
-###
-## TAG IMAGE
-#
-# Tag latest on master branch
-tag_image.latest:
-  stage: tag_latest
-  script:
-    - docker pull "${CI_REGISTRY_IMAGE}:branch-${CI_COMMIT_REF_NAME}"
-    - docker tag "${CI_REGISTRY_IMAGE}:branch-${CI_COMMIT_REF_NAME}" "${CI_REGISTRY_IMAGE}:latest"
-    - docker push "${CI_REGISTRY_IMAGE}:latest"
-  only:
-    - master
-  except:
-    - tags
-  tags:
-    - tractor
+  - tags

Dockerfile

@@ -1,41 +1,66 @@
-FROM node:slim as builder
+FROM node:16-alpine as builder
 
-ARG H5AI_VERSION=0.29.0
+ENV H5AI_VERSION=0.30.0
 
-RUN apt-get update \
- && apt-get --no-install-recommends -y install \
-            git-core \
-            patch \
+RUN apk add --no-cache git patch \
  && git clone https://github.com/lrsjng/h5ai.git \
  && cd h5ai \
  && git checkout -b ${H5AI_VERSION} tags/v${H5AI_VERSION} \
  && npm install \
- && npm audit fix \
  && npm run build
 
 COPY class-setup.php.patch /class-setup.php.patch
 RUN patch -p1 -u -d /h5ai/build/_h5ai/private/php/core/ -i /class-setup.php.patch \
  && rm /class-setup.php.patch
 
-FROM alpine:3.7
+FROM nginx:1.25-alpine-slim
 
-LABEL maintainer "[email protected]"
+LABEL maintainer="pad92" \
+      org.label-schema.url="https://github.com/pad92/docker-h5ai/blob/master/README.md" \
+      org.label-schema.build-date=$BUILD_DATE \
+      org.label-schema.version=$H5AI_VERSION \
+      org.label-schema.vcs-url="https://github.com/pad92/docker-h5ai.git" \
+      org.label-schema.vcs-ref=$BUILD_VCSREF \
+      org.label-schema.docker.dockerfile="/Dockerfile" \
+      org.label-schema.description="h5ai on alpine docker image" \
+      org.label-schema.schema-version="1.0"
 
 RUN apk add --no-cache \
-    nginx \
+    apache2-utils \
+    curl \
     ffmpeg \
-    graphicsmagick \
-    php7-fpm php7-curl php7-iconv php7-xml php7-dom php7-json php7-zip php7-session php7-gd
+    imagemagick \
+    php81 \
+    php81-exif \
+    php81-fileinfo \
+    php81-fpm \
+    php81-gd \
+    php81-intl \
+    php81-json \
+    php81-mbstring \
+    php81-opcache \
+    php81-openssl \
+    php81-pecl-imagick \
+    php81-session \
+    php81-simplexml \
+    php81-xml \
+    php81-xmlwriter \
+    php81-zip \
+    supervisor \
+    tzdata \
+    zip
 
 COPY --from=builder /h5ai/build/_h5ai /usr/share/h5ai/_h5ai
 
 COPY slash/     /
 
-RUN sed -i '/txt;$/ a text/plain cfg;' /etc/nginx/mime.types \ 
- && sed -i '/txt;$/ a text/plain ini;' /etc/nginx/mime.types \ 
+RUN ln -sf /dev/stderr /var/log/php81/error.log \
+ && ln -sf /dev/stdout /var/log/nginx/access.log \
+ && ln -sf /dev/stderr /var/log/nginx/error.log \
  && chown nginx:www-data /usr/share/h5ai/_h5ai/public/cache/ \
  && chown nginx:www-data /usr/share/h5ai/_h5ai/private/cache/
 
 EXPOSE 80
 
-CMD ["/entrypoint.sh"]
+CMD supervisord -c /etc/supervisor/conf.d/supervisord.conf
+HEALTHCHECK CMD curl -I --fail http://localhost/ || exit 1

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 OurContainers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -2,15 +2,25 @@
 
 [h5ai project](https://larsjung.de/h5ai/)
 
+[![GitHub issues](https://img.shields.io/github/issues/pad92/docker-h5ai.svg)](https://github.com/pad92/docker-h5ai) [![Docker Automated build](https://img.shields.io/docker/automated/pad92/docker-h5ai.svg?maxAge=2592000)](https://hub.docker.com/r/pad92/docker-h5ai/) [![Docker Pulls](https://img.shields.io/docker/pulls/pad92/docker-h5ai.svg)](https://hub.docker.com/r/pad92/docker-h5ai/)
+
+# Usage
+
+## Commun
+
 ```
-docker container run -it -p 80:80 -v $PWD/sharing-file:/share akit042/docker-h5ai
+docker container run -it -p 80:80 \
+  -v $PWD/sharing-file:/share \
+  pad92/docker-h5ai
 ```
 
-for overide options.json
+## With custom h5ai options
+
+For overide [options.json](https://raw.githubusercontent.com/lrsjng/h5ai/v0.29.0/src/_h5ai/private/conf/options.json) file is into `/usr/share/h5ai/_h5ai/private/conf/options.json`
 
 ```
 docker container run -it -p 80:80 \
   -v $PWD/sharing-file:/share \
   -v $PWD/options.json:/usr/share/h5ai/_h5ai/private/conf/options.json \
-  akit042/docker-h5ai
+  pad92/docker-h5ai
 ```

docker-compose.yml

@@ -0,0 +1,11 @@
+version: '3'
+services:
+  h5ai-devel:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    image: h5ai-devel
+    ports:
+    - 8888:80
+    volumes:
+    - .:/share:ro