From 2ba656b1d9d3d633b46a0978529132b2118ee2ab Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Mon, 5 Feb 2024 23:11:16 +1100
Subject: [PATCH] Update to php 8.3, change armv7l build to arm64

---
 .gitlab-ci.yml              |  1 +
 .gitlab-docker-arm64.yml    | 18 ++++++++++++++++++
 .gitlab-docker-manifest.yml |  2 +-
 Dockerfile                  |  2 +-
 4 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 .gitlab-docker-arm64.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2ef9c29..7521812 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,4 +28,5 @@ include:
 - .gitlab-test.yml
 - .gitlab-docker-x86_64.yml
 # .gitlab-docker-armv7l.yml
+- .gitlab-docker-arm64.yml
 - .gitlab-docker-manifest.yml
diff --git a/.gitlab-docker-arm64.yml b/.gitlab-docker-arm64.yml
new file mode 100644
index 0000000..3f9624a
--- /dev/null
+++ b/.gitlab-docker-arm64.yml
@@ -0,0 +1,18 @@
+arm64:build:
+  variables:
+    ARCH: arm64
+
+  stage: build
+
+  script:
+  - if [ -f init ]; then chmod 500 init; fi
+  - echo -n ${CI_COMMIT_SHORT_SHA} > VERSION
+  - rm -rf vendor/ database/schema database/seeders/Test*.php database/factories/*
+  - docker build -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH} .
+  - docker push ${CI_REGISTRY_IMAGE}:${VERSIONARCH}
+
+  tags:
+  - docker
+  - arm64
+  only:
+  - master
diff --git a/.gitlab-docker-manifest.yml b/.gitlab-docker-manifest.yml
index 89cfa9d..0c90213 100644
--- a/.gitlab-docker-manifest.yml
+++ b/.gitlab-docker-manifest.yml
@@ -1,7 +1,7 @@
 x86_64:build-manifest:
   stage: build-manifest
   script:
-  - docker manifest create ${CI_REGISTRY_IMAGE}:${VERSION} ${CI_REGISTRY_IMAGE}:${VERSION}-x86_64 #${CI_REGISTRY_IMAGE}:${VERSION}-armv7l #${CI_REGISTRY_IMAGE}:${VERSION}-arm64
+  - docker manifest create ${CI_REGISTRY_IMAGE}:${VERSION} ${CI_REGISTRY_IMAGE}:${VERSION}-x86_64 ${CI_REGISTRY_IMAGE}:${VERSION}-arm64 #${CI_REGISTRY_IMAGE}:${VERSION}-armv7l
   - docker manifest push --purge ${CI_REGISTRY_IMAGE}:${VERSION}
   tags:
   - docker
diff --git a/Dockerfile b/Dockerfile
index 1210959..e751d26 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.dege.au/leenooks/php:8.1-fpm-pgsql-server
+FROM registry.dege.au/leenooks/php:8.3-fpm-pgsql-server
 
 VOLUME [ "/var/cache/composer", "/var/lib/zerotier-one" ]