Update to php 8.3, change armv7l build to arm64

This commit is contained in:
Deon George 2024-02-05 23:11:16 +11:00
parent cb09016539
commit 2ba656b1d9
4 changed files with 21 additions and 2 deletions

View File

@ -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

18
.gitlab-docker-arm64.yml Normal file
View File

@ -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

View File

@ -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

View File

@ -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" ]