From 13a6eb69411557687d18c6f12ee942c4761d0d22 Mon Sep 17 00:00:00 2001 From: hansi Date: Mon, 7 Sep 2026 12:36:56 +0200 Subject: [PATCH] update php:8.2-fpm-alpine to php:8.4-fpm-alpine update bludit_version=3.20.0 to bludit_version=3.22.0 add zip module add kubernetes namespace and persistantvolumeclaim --- Dockerfile | 10 +++---- README.md | 3 +- kubernetes/deployment.yml | 22 +++++++++++++-- kubernetes/namespace.yml | 7 +++++ kubernetes/persistentvolumeclaim.yml | 42 ++++++++++++++++++++++++++++ kubernetes/service.yml | 1 + 6 files changed, 76 insertions(+), 9 deletions(-) create mode 100644 kubernetes/namespace.yml create mode 100644 kubernetes/persistentvolumeclaim.yml diff --git a/Dockerfile b/Dockerfile index f8561e4..2174d05 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ -FROM php:8.2-fpm-alpine +FROM php:8.4-fpm-alpine # Set environment variables -ENV bludit_version=3.20.0 \ +ENV bludit_version=3.22.0 \ bludit_content=/usr/share/nginx/html/bl-content \ - bludit_url=https://github.com/bludit/bludit/archive/refs/tags/3.20.0.zip + bludit_url=https://github.com/bludit/bludit/archive/refs/tags/3.22.0.zip # Install required packages -RUN apk add --no-cache nginx curl unzip bash +RUN apk add --no-cache nginx curl unzip bash libzip-dev # Configure PHP -RUN docker-php-ext-install opcache +RUN docker-php-ext-install opcache zip # Install gd PHP module RUN apk add --no-cache libpng-dev libjpeg-turbo-dev freetype-dev \ diff --git a/README.md b/README.md index 3ffc37e..8941f20 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,5 @@ $ docker rmi bludit/docker:latest The Kubernetes manifests are basic and can be improved for better security and shared storage to support multiple replicas. ``` -$ kubectl apply -f kubernetes/deployment.yml -$ kubectl apply -f kubernetes/service.yml +$ kubectl apply -f kubernetes/ ``` diff --git a/kubernetes/deployment.yml b/kubernetes/deployment.yml index 3c323da..a462145 100644 --- a/kubernetes/deployment.yml +++ b/kubernetes/deployment.yml @@ -3,6 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: bludit + namespace: bludit labels: app: bludit spec: @@ -17,8 +18,8 @@ spec: spec: containers: - name: bludit - image: bludit:latest - imagePullPolicy: Always + image: bludit/docker:3.22.0 + imagePullPolicy: IfNotPresent ports: - containerPort: 80 resources: @@ -40,3 +41,20 @@ spec: port: 80 initialDelaySeconds: 15 periodSeconds: 20 + volumeMounts: + - name: bludit-content + mountPath: /usr/share/nginx/html/bl-content + - name: bludit-plugins + mountPath: /usr/share/nginx/html/bl-plugins + - name: bludit-themes + mountPath: /usr/share/nginx/html/bl-themes + volumes: + - name: bludit-content + persistentVolumeClaim: + claimName: bludit-content + - name: bludit-plugins + persistentVolumeClaim: + claimName: bludit-plugins + - name: bludit-themes + persistentVolumeClaim: + claimName: bludit-themes diff --git a/kubernetes/namespace.yml b/kubernetes/namespace.yml new file mode 100644 index 0000000..504c254 --- /dev/null +++ b/kubernetes/namespace.yml @@ -0,0 +1,7 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: bludit + labels: + app: bludit diff --git a/kubernetes/persistentvolumeclaim.yml b/kubernetes/persistentvolumeclaim.yml new file mode 100644 index 0000000..8f700a6 --- /dev/null +++ b/kubernetes/persistentvolumeclaim.yml @@ -0,0 +1,42 @@ +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + labels: + app: bludit + name: bludit-content + namespace: bludit +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 100M +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + labels: + app: bludit + name: bludit-plugins + namespace: bludit +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 100M +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + labels: + app: bludit + name: bludit-themes + namespace: bludit +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 100M diff --git a/kubernetes/service.yml b/kubernetes/service.yml index 3002a70..b03ea26 100644 --- a/kubernetes/service.yml +++ b/kubernetes/service.yml @@ -3,6 +3,7 @@ kind: Service apiVersion: v1 metadata: name: bludit + namespace: bludit spec: selector: app: bludit