From 00b5fef1a280e8287ae6c2182eec3c28047bf684 Mon Sep 17 00:00:00 2001
From: Jon Pugh <jon@thinkdrop.net>
Date: Wed, 25 Oct 2023 18:44:44 -0400
Subject: [PATCH] - Remove devshop.remote container playbook. - Add phpX-zip

---
 .github/workflows/devshop.yml            | 2 +-
 docker/docker-compose.yml                | 2 +-
 roles/opendevshop.apache/vars/Debian.yml | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/devshop.yml b/.github/workflows/devshop.yml
index 99a685907..852baab86 100644
--- a/.github/workflows/devshop.yml
+++ b/.github/workflows/devshop.yml
@@ -141,7 +141,7 @@ jobs:
         # Since the container is launched with a new DEVSHOP_DOCKER_COMMAND_RUN, run the default.
         run: |
           docker-compose exec -T devshop.server bash -c '${DEFAULT_DEVSHOP_DOCKER_COMMAND_RUN}'
-          docker-compose exec -T devshop.remote bash -c '${DEFAULT_DEVSHOP_DOCKER_COMMAND_RUN}'
+#          docker-compose exec -T devshop.remote bash -c '${DEFAULT_DEVSHOP_DOCKER_COMMAND_RUN}'
 
       - name: "Test DevShop"
         working-directory: docker
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 05dcdfb9d..bd7f3cd56 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -46,7 +46,7 @@ services:
       - DEVSHOP_ANSIBLE_GROUP_NAME=devshop_server
 
   devshop.remote:
-    image: devshop/remote:latest
+    image: ${DEVSHOP_DOCKER_IMAGE:-devshop/server:php8.1}
     build:
       context: ".."
       dockerfile: "docker/Dockerfile.remote"
diff --git a/roles/opendevshop.apache/vars/Debian.yml b/roles/opendevshop.apache/vars/Debian.yml
index 4ab9f911b..4507a5e8c 100644
--- a/roles/opendevshop.apache/vars/Debian.yml
+++ b/roles/opendevshop.apache/vars/Debian.yml
@@ -20,6 +20,7 @@ php_packages_extra:
   - libapache2-mod-php8.1
   - "php{{ php_version }}-bcmath"
   - "php{{ php_version }}-intl"
+  - "php{{ php_version }}-zip"
 
 # opendevshop.apache/tasks/main.yml disables all the mods, then enables these.
 apache_mods_enabled: