Merge branch 'release-2.3' into dev

emaijala · Nov 21, 2024 · 66cc073 · 66cc073
2 parents e38a60a + 7e05fcf
commit 66cc073
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/docker-nginx/Dockerfile b/docker-nginx/Dockerfile
@@ -1,13 +1,13 @@
 FROM alpine:latest
 
 RUN apk update
-RUN apk --no-cache add nginx php83-mbstring php83-fpm php83-mysqli php83-session curl unzip
+RUN apk --no-cache add nginx php83-ctype php83-mbstring php83-fpm php83-mysqli php83-session curl unzip
 
 WORKDIR /work
 
-RUN curl -O https://labs.fi/files/mlinvoice-2.3.0.zip
-RUN unzip mlinvoice-2.3.0.zip
-RUN rm mlinvoice-2.3.0.zip
+RUN curl -o mlinvoice.zip https://labs.fi/files/mlinvoice-2.3.1.zip
+RUN unzip mlinvoice.zip
+RUN rm mlinvoice.zip
 
 RUN sed -ri \
  -e "s/^user = nobody/user = www/" \

diff --git a/mlinvoice.spec b/mlinvoice.spec
@@ -64,6 +64,8 @@ EOM
 %{_datadir}/%{name}
 
 %changelog
+* Thu 21 Nov 2024 Ere Maijala <ere@labs.fi> - 2.3.1
+- updated for version 2.3.1
 * Sun 03 Nov 2024 Ere Maijala <ere@labs.fi> - 2.3.0
 - updated for version 2.3.0
 * Sat 25 Oct 2024 Ere Maijala <ere@labs.fi> - 2.2.1

diff --git a/version.php b/version.php
@@ -26,4 +26,4 @@
  * @link     http://labs.fi/mlinvoice.eng.php
  */
 // Version in Semver (https://semver.org/) compatible form (e.g. 1.2.3 or 1.2.3-beta.1)
-$softwareVersion = '2.3.0';
+$softwareVersion = '2.3.1';