From 96e3b355f63d25b8d8505ec3c54d6500f1168f42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Ku=C4=8Dera?=
 <lubomir.kucera.jr@gmail.com>
Date: Sun, 18 Jun 2023 17:26:59 +0200
Subject: [PATCH 1/3] Upgrade osTicket to version 1.18

---
 Dockerfile    | 9 +++++----
 README.md     | 2 +-
 image-version | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3ccf86b..06e6560 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -61,8 +61,8 @@ RUN set -ex; \
     rm -rf /tmp/pear /var/cache/apk/*
 # DO NOT FORGET TO CHECK THE LANGUAGE PACK DOWNLOAD URL BELOW
 # DO NOT FORGET TO UPDATE "image-version" FILE
-ENV OSTICKET_VERSION=1.17.4 \
-    OSTICKET_SHA256SUM=59a08586e5af5b7235edd2c02bb7b55d80dabe2c54f7ed22754139147b87e881
+ENV OSTICKET_VERSION=1.18 \
+    OSTICKET_SHA256SUM=c0c3ef4220b8709e1dbe12503294d412390e91d638e8c6d57ab8d8403c5753e1
 RUN --mount=type=bind,source=utils/verify-plugin.php,target=/tmp/verify-plugin.php,readonly \
     \
     set -ex; \
@@ -84,8 +84,9 @@ v${OSTICKET_VERSION}/osTicket-v${OSTICKET_VERSION}.zip; \
     for lang in bg bn bs ca cs da de el es_AR es_ES es_MX et eu fa fi fr gl he hi hr hu id is it \
         ja ka km ko lt lv mk mn ms nl no pl pt_BR pt_PT ro ru sk sl sq sr sr_CS sv_SE sw th tr uk \
         ur_IN ur_PK vi zh_CN zh_TW; do \
-        # This URL is the same as what is used by the official osTicket Downloads page. This URL is
-        # used even for minor versions >= 14.
+        # Language packs from https://s3.amazonaws.com/downloads.osticket.com/lang/1.17.x/ (used by
+        # the official osTicket Downloads page) cannot be authenticated. See:
+        # https://github.com/osTicket/osTicket/issues/6377
         wget -q -O /var/www/html/include/i18n/${lang}.phar \
             https://s3.amazonaws.com/downloads.osticket.com/lang/1.14.x/${lang}.phar; \
         php /tmp/verify-plugin.php "/var/www/html/include/i18n/${lang}.phar"; \
diff --git a/README.md b/README.md
index 002c6a1..a83798a 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ docker-osticket
 
 # Introduction
 
-Docker image for running version 1.17 of [osTicket](http://osticket.com/).
+Docker image for running version 1.18 of [osTicket](http://osticket.com/).
 
 **Important! If upgrading from images <1.17.0, read the upgrade instructions below, as images 1.17.0
 and later have plugin-related breaking changes.**
diff --git a/image-version b/image-version
index b5aaf81..84cc529 100644
--- a/image-version
+++ b/image-version
@@ -1 +1 @@
-1.17.4
+1.18.0

From 82a3341790a7850555a4e8a9e3597c463aa7150a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Ku=C4=8Dera?=
 <lubomir.kucera.jr@gmail.com>
Date: Sun, 18 Jun 2023 17:36:19 +0200
Subject: [PATCH 2/3] Upgrade Alpine Linux to version 3.18

---
 Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 06e6560..b4a087d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.3
 
-FROM php:8.1-fpm-alpine3.16
+FROM php:8.1-fpm-alpine3.18
 RUN set -ex; \
     \
     export CFLAGS="-Os"; \
@@ -17,6 +17,7 @@ RUN set -ex; \
         msmtp \
         nginx \
         openldap \
+        openssl \
         runit \
     ; \
     \
@@ -29,6 +30,7 @@ RUN set -ex; \
         libpng-dev \
         libzip-dev \
         openldap-dev \
+        openssl-dev \
     ; \
     \
     # Install PHP extensions

From 8e8e3e9853bd85829b71812446c3d8a84dbed2b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Ku=C4=8Dera?=
 <lubomir.kucera.jr@gmail.com>
Date: Sun, 18 Jun 2023 17:44:05 +0200
Subject: [PATCH 3/3] Upgrade PHP to version 8.2

---
 Dockerfile | 3 ++-
 README.md  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b4a087d..b6d0194 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.3
 
-FROM php:8.1-fpm-alpine3.18
+FROM php:8.2-fpm-alpine3.18
 RUN set -ex; \
     \
     export CFLAGS="-Os"; \
@@ -29,6 +29,7 @@ RUN set -ex; \
         imap-dev \
         libpng-dev \
         libzip-dev \
+        linux-headers \
         openldap-dev \
         openssl-dev \
     ; \
diff --git a/README.md b/README.md
index a83798a..705f373 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ It has a few modifications:
   * EMail support
 
 osTicket is being served by [nginx](http://wiki.nginx.org/Main) using
-[PHP-FPM](http://php-fpm.org/) with PHP 8.1.
+[PHP-FPM](http://php-fpm.org/) with PHP 8.2.
 PHP [mail](http://php.net/manual/en/function.mail.php) function is configured to use
 [msmtp](http://msmtp.sourceforge.net/) to send out-going messages.