From cd26c0709905c078b898b6fca76bb6e4e9c32170 Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Mon, 8 Jan 2024 21:15:39 +1100
Subject: [PATCH] Update CI now that alpine has been merged into master

---
 .gitlab-ci.yml              | 4 ++--
 .gitlab-docker-arm64.yml    | 4 ++--
 .gitlab-docker-armv7l.yml   | 4 ++--
 .gitlab-docker-manifest.yml | 4 ++--
 .gitlab-docker-x86_64.yml   | 4 ++--
 Dockerfile.phptest          | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b4b6fff..7b12c14 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,8 +5,8 @@ stages:
 - build-manifest-test
 
 variables:
-  BRANCH: alpine
-  VERSION: 8.1-fpm-${BRANCH}
+  BRANCH: master
+  VERSION: 8.1-fpm
   DOCKER_HOST: tcp://docker:2375
   VERSIONARCH: ${VERSION}-${ARCH}
 
diff --git a/.gitlab-docker-arm64.yml b/.gitlab-docker-arm64.yml
index 5a066ff..f6a04a4 100644
--- a/.gitlab-docker-arm64.yml
+++ b/.gitlab-docker-arm64.yml
@@ -13,7 +13,7 @@ arm64:build:
   - docker
   - arm64
   only:
-  - alpine
+  - master
 
 #arm64:build-test:
 #  variables:
@@ -26,4 +26,4 @@ arm64:build:
 #  - docker
 #  - arm64
 #  only:
-#  - alpine
+#  - master
diff --git a/.gitlab-docker-armv7l.yml b/.gitlab-docker-armv7l.yml
index c54a007..7ef70fb 100644
--- a/.gitlab-docker-armv7l.yml
+++ b/.gitlab-docker-armv7l.yml
@@ -13,7 +13,7 @@ armv7l:build:
   - docker
   - armv7l
   only:
-  - alpine
+  - master
 
 #armv7l:build-test:
 #  variables:
@@ -26,4 +26,4 @@ armv7l:build:
 #  - docker
 #  - armv7l
 #  only:
-#  - alpine
+#  - master
diff --git a/.gitlab-docker-manifest.yml b/.gitlab-docker-manifest.yml
index 7444c23..c184e69 100644
--- a/.gitlab-docker-manifest.yml
+++ b/.gitlab-docker-manifest.yml
@@ -11,7 +11,7 @@ x86_64:build-manifest:
   - docker
   - x86_64
   only:
-  - alpine
+  - master
 
 x86_64:build-manifest-test:
   stage: build-manifest-test
@@ -22,4 +22,4 @@ x86_64:build-manifest-test:
   - docker
   - x86_64
   only:
-  - alpine
+  - master
diff --git a/.gitlab-docker-x86_64.yml b/.gitlab-docker-x86_64.yml
index ee944ba..d3ee776 100644
--- a/.gitlab-docker-x86_64.yml
+++ b/.gitlab-docker-x86_64.yml
@@ -13,7 +13,7 @@ x86_64:build:
   - docker
   - x86_64
   only:
-  - alpine
+  - master
 
 x86_64:build-test:
   variables:
@@ -26,4 +26,4 @@ x86_64:build-test:
   - docker
   - x86_64
   only:
-  - alpine
+  - master
diff --git a/Dockerfile.phptest b/Dockerfile.phptest
index f153b71..3f45c7f 100644
--- a/Dockerfile.phptest
+++ b/Dockerfile.phptest
@@ -1,7 +1,7 @@
 # NAME leenooks/php
-# VERSION 8.1-fpm-alpine-test
+# VERSION 8.1-fpm-test
 
-FROM registry.dege.au/leenooks/php:8.1-fpm-alpine
+FROM registry.dege.au/leenooks/php:8.1-fpm
 
 # Add other built tools
 RUN apk --no-cache add npm linux-headers \