From 09864c6d987136d999fe11bfcb35c4fd5b9359f2 Mon Sep 17 00:00:00 2001
From: Aleksander Cynarski <aleksander@cynarski.pl>
Date: Sun, 5 Jun 2022 22:49:25 +0200
Subject: [PATCH] dexter test

---
 .drone.yml                            | 78 ++++++++++++++++-----------
 Dockerfile                            |  1 +
 docker/usr/local/bin/php_configure.sh |  4 ++
 3 files changed, 51 insertions(+), 32 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index d9b03de..a47ac6b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -14,6 +14,7 @@ steps:
     platforms:
       - linux/amd64
       - linux/arm64
+      - linux/arm/v7
     build_args:
       - PHP_VERSION=8.1-fpm-alpine3.16
     tags: 8.1-alpine
@@ -34,6 +35,7 @@ steps:
     platforms:
       - linux/amd64
       - linux/arm64
+      - linux/arm/v7
     build_args:
       - PHP_VERSION=8.0-fpm-alpine3.16
     tags: 8.0-alpine
@@ -54,6 +56,7 @@ steps:
     platforms:
       - linux/amd64
       - linux/arm64
+      - linux/arm/v7
     build_args:
       - PHP_VERSION=7.4-fpm-alpine3.16
     tags: 7.4-alpine
@@ -62,36 +65,47 @@ steps:
       - master
   depends_on: [ clone ]
 
-# - name: php7.3
-#   image: thegeeklab/drone-docker-buildx
-#   settings:
-#     username: 
-#       from_secret: hub_username
-#     password: 
-#       from_secret: hub_password
-#     repo: 
-#       from_secret: hub_repo
-#     build_args:
-#       - PHP_VERSION=7.3-fpm-alpine3.13
-#     tags: 7.3-alpine
-#   when: 
-#     branch:
-#       - master
-#   depends_on: [ clone ]
+- name: php7.3
+  image: thegeeklab/drone-docker-buildx
+  settings:
+    username: 
+      from_secret: hub_username
+    password: 
+      from_secret: hub_password
+    repo: 
+      from_secret: hub_repo
+    platforms:
+      - linux/amd64
+      - linux/arm64
+      - linux/arm/v7
+    build_args:
+      - PHP_VERSION=7.3-fpm-alpine3.13
+    tags: 7.3-alpine
+  when: 
+    branch:
+      - master
+  depends_on: [ clone ]
 
-# - name: php7.2
-#   image: thegeeklab/drone-docker-buildx
-#   settings:
-#     username: 
-#       from_secret: hub_username
-#     password: 
-#       from_secret: hub_password
-#     repo: 
-#       from_secret: hub_repo
-#     build_args:
-#       - PHP_VERSION=7.2-fpm-alpine3.12
-#     tags: 7.2-alpine
-#   when: 
-#     branch:
-#       - master
-#   depends_on: [ clone ]
+- name: php7.2
+  image: thegeeklab/drone-docker-buildx
+  settings:
+    username: 
+      from_secret: hub_username
+    password: 
+      from_secret: hub_password
+    repo: 
+      from_secret: hub_repo
+    platforms:
+      - linux/amd64
+      - linux/arm64
+      - linux/arm/v7
+    build_args:
+      - PHP_VERSION=7.2-fpm-alpine3.12
+    tags: 7.2-alpine
+  when: 
+    branch:
+      - master
+  depends_on: [ clone ]
+
+
+node: dexter
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 268b89f..8c369b3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,7 @@ FROM php:${PHP_VERSION} as builder
 RUN apk add --no-cache --virtual build-essentials build-base \
     icu-dev icu-libs zlib-dev g++ make automake autoconf libzip-dev \
     libpng-dev libwebp-dev libjpeg-turbo-dev freetype-dev \
+    tar \
     wget \
 	curl \
 	bash \
diff --git a/docker/usr/local/bin/php_configure.sh b/docker/usr/local/bin/php_configure.sh
index d00e4f8..bf5e1ee 100755
--- a/docker/usr/local/bin/php_configure.sh
+++ b/docker/usr/local/bin/php_configure.sh
@@ -82,6 +82,10 @@ case $PHP_VERSION in
     	h1 "Install iconv extension"
     	apk add --no-cache --virtual php7-iconv
     ;;
+    '73' )
+		h2 "[php74] Configure and install GD, JSON, MEMCACHE, ICONV"
+		apk add --no-cache --virtual php7-gd php7-json php7-pecl-memcache php7-iconv
+    ;;
     * )
 		h2 "Configure and install GD"
 		docker-php-ext-configure gd \