From 4cdfbe51216989fc4ea01e807f7df13ed1e1ec4e Mon Sep 17 00:00:00 2001
From: Magnus Walbeck <magnus.walbeck@walbeck.it>
Date: Fri, 22 Jan 2021 13:27:05 +0100
Subject: [PATCH] Have pecl extensions managed by renovate

---
 .vscode/tasks.json | 27 +++++++++++++++++++++++++++
 1.6/Dockerfile     | 10 ++++++++--
 1.7/Dockerfile     | 10 ++++++++--
 3 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 .vscode/tasks.json

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 0000000..7f2af2f
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,27 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "docker-build: 1.6",
+            "type": "docker-build",
+            "dockerBuild": {
+				"tag": "dockergetgrav:1.6",
+				"dockerfile": "${workspaceFolder}/1.6/Dockerfile",
+				"context": "${workspaceFolder}",
+				"pull": true
+			}
+        },
+        {
+            "label": "docker-build: 1.7",
+            "type": "docker-build",
+            "dockerBuild": {
+				"tag": "dockergetgrav:1.7",
+				"dockerfile": "${workspaceFolder}/1.7/Dockerfile",
+				"context": "${workspaceFolder}",
+				"pull": true
+			}
+        }
+    ]
+}
diff --git a/1.6/Dockerfile b/1.6/Dockerfile
index 5712bf1..23217fb 100644
--- a/1.6/Dockerfile
+++ b/1.6/Dockerfile
@@ -1,7 +1,13 @@
 FROM php:7.3.26-fpm-buster@sha256:cca12409a6b5f035af4e495a25fc2639fc82516d02e25457dbdf8505676ee4b0
 
+SHELL [ "/bin/bash", "-c" ]
+
 # renovate: datasource=github-tags depName=getgrav/grav versioning=semver
 ENV GRAV_VERSION 1.6.31
+# renovate: datasource=github-tags depName=krakjoe/apcu versioning=semver
+ENV PHP_APCU_VERSION v5.1.18
+# renovate: datasource=github-tags depName=php/pecl-file_formats-yaml versioning=semver
+ENV PHP_YAML_VERSION 2.1.0
 
 RUN set -ex; \
     \
@@ -37,8 +43,8 @@ RUN set -ex; \
         opcache \
     ; \
     \
-    pecl install apcu-5.1.18; \
-    pecl install yaml-2.1.0; \
+    pecl install apcu-${PHP_APCU_VERSION:1}; \
+    pecl install yaml-$PHP_YAML_VERSION; \
     \
     docker-php-ext-enable \
         apcu \
diff --git a/1.7/Dockerfile b/1.7/Dockerfile
index 7e80883..27956e3 100644
--- a/1.7/Dockerfile
+++ b/1.7/Dockerfile
@@ -1,7 +1,13 @@
 FROM php:7.3.26-fpm-buster@sha256:cca12409a6b5f035af4e495a25fc2639fc82516d02e25457dbdf8505676ee4b0
 
+SHELL [ "/bin/bash", "-c" ]
+
 # renovate: datasource=github-tags depName=getgrav/grav versioning=semver
 ENV GRAV_VERSION 1.7.3
+# renovate: datasource=github-tags depName=krakjoe/apcu versioning=semver
+ENV PHP_APCU_VERSION v5.1.18
+# renovate: datasource=github-tags depName=php/pecl-file_formats-yaml versioning=semver
+ENV PHP_YAML_VERSION 2.1.0
 
 RUN set -ex; \
     \
@@ -37,8 +43,8 @@ RUN set -ex; \
         opcache \
     ; \
     \
-    pecl install apcu-5.1.18; \
-    pecl install yaml-2.1.0; \
+    pecl install apcu-${PHP_APCU_VERSION:1}; \
+    pecl install yaml-$PHP_YAML_VERSION; \
     \
     docker-php-ext-enable \
         apcu \
-- 
2.45.2