From f3f75aa6364dadda264eac817d58d2365794ba81 Mon Sep 17 00:00:00 2001
From: Ric Harvey <ric@digilution.io>
Date: Mon, 3 Aug 2020 10:07:28 +0100
Subject: [PATCH] ARM builds + nginx 1.18.0 and PHP 7.4.8

---
 .gitlab-ci.yml     | 15 +--------------
 README.md          |  2 +-
 build.sh           | 13 +++++++++++++
 docs/versioning.md |  1 +
 version            |  1 +
 5 files changed, 17 insertions(+), 15 deletions(-)
 create mode 100755 build.sh
 create mode 100644 version

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 66f8c52..1415013 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,6 @@ services:
 
 stages:
   - build_latest
-  - build_tags
 
 before_script:
   - echo Logging in to $CI_REGISTRY...
@@ -15,18 +14,6 @@ build_latest:
   stage: build_latest
   script:
     - echo Build started on `date` for $CI_COMMIT_REF_NAME
-    - docker build -t richarvey/nginx-php-fpm:latest .
-    - docker images
-    - docker push "$CI_REGISTRY_IMAGE":latest
+    - ./build.sh
   only:
     - master
-
-build_tags:
-  stage: build_tags
-  script:
-    - echo Build started on `date` for $CI_COMMIT_REF_NAME
-    - docker build -t richarvey/nginx-php-fpm:"$CI_COMMIT_REF_NAME" .
-    - docker images
-    - docker push "$CI_REGISTRY_IMAGE":"$CI_COMMIT_REF_NAME"
-  only:
-    - tags
diff --git a/README.md b/README.md
index f35accc..c77b18d 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ If you have improvements or suggestions please open an issue or pull request on
 ### Versioning
 | Docker Tag | Git Release | Nginx Version | PHP Version | Alpine Version |
 |-----|-------|-----|--------|--------|
-| latest/1.9.1 | Master Branch |1.16.1 | 7.4.5 | 3.11 |
+| latest/1.10.0 | Master Branch |1.18.0 | 7.4.8 | 3.12 |
 
 For other tags please see: [versioning](https://gitlab.com/ric_harvey/nginx-php-fpm/blob/master/docs/versioning.md)
 
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000..d5a38e1
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+version=`cat version`
+
+# Set up environment
+docker version
+docker buildx ls
+docker buildx create --name phpbuilder
+docker buildx use phpbuilder
+
+echo "Building: PHP Container"
+docker buildx build --platform linux/amd64,linux/arm64 -t "richarvey/nginx-php-fpm:'$VERSION'" -t richarvey/nginx-php-fpm:latest --push .
+
diff --git a/docs/versioning.md b/docs/versioning.md
index 3724a58..561355e 100644
--- a/docs/versioning.md
+++ b/docs/versioning.md
@@ -19,6 +19,7 @@ The latest tag will always follow the master branch in git. the other versions w
 |-----|-------|-----|--------|--------|----------|
 | 1.9.0 | 7.4.2 |1.16.1 | 3.11 | 0.3.13 | upgrade to PHP 7.4.2 |
 | 1.9.1 | 7.4.5 |1.16.1 | 3.11 | 0.3.13 | upgrade to PHP 7.4.5 |
+| 1.10.0 | 7.4.5 |1.18.0 | 3.12 | 0.3.13 | PHP 7.4.8 + Nginx 1.18.0 + arm builds |
 
 These tags will be created on GitLab and as tags in docker hub.
 
diff --git a/version b/version
new file mode 100644
index 0000000..81c871d
--- /dev/null
+++ b/version
@@ -0,0 +1 @@
+1.10.0