From a26ab7850de6444c56b7c6be0442a72aec81f7b4 Mon Sep 17 00:00:00 2001
From: Trung Thanh Phan <trung.thanh.phan@canonical.com>
Date: Thu, 19 Oct 2023 09:22:24 +0200
Subject: [PATCH] readd package to try and solve wp client issue

---
 wordpress_rock/rockcraft.yaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/wordpress_rock/rockcraft.yaml b/wordpress_rock/rockcraft.yaml
index 5f2ad943..0acbc8cb 100644
--- a/wordpress_rock/rockcraft.yaml
+++ b/wordpress_rock/rockcraft.yaml
@@ -5,8 +5,6 @@ name: wordpress
 summary: Wordpress rock
 description: Wordpress OCI image for the Wordpress charm
 base: ubuntu:20.04
-# base: bare
-# build-base: ubuntu:20.04
 run-user: _daemon_
 license: Apache-2.0
 version: "1.0"
@@ -18,6 +16,9 @@ parts:
     source: files
     build-packages:
     - apache2
+    - bzr
+    - curl
+    - git
     - libapache2-mod-php
     - libgmp-dev
     - php
@@ -30,11 +31,14 @@ parts:
     - pwgen
     - python3
     - python3-yaml
+    - unzip
     overlay-packages:
     - apache2
+    - bzr
+    - curl
+    - git
     - libapache2-mod-php
     - libgmp-dev
-    - curl
     - php
     - php-curl
     - php-gd
@@ -45,6 +49,7 @@ parts:
     - pwgen
     - python3
     - python3-yaml
+    - unzip
     build-environment:
       # Required to source $CRAFT_OVERLAY/etc/apache2/envvars
       - APACHE_CONFDIR: /etc/apache2
@@ -126,11 +131,6 @@ parts:
       - PHP_VERSION: 7.4
       - IMAGE_RUN_USER_ID: 584792
       - IMAGE_RUN_GROUP_ID: 584792
-    build-packages:
-      - bzr
-      - curl
-      - git
-      - unzip
     override-build: |
       curl -sSL --create-dirs https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -o wp
       chmod +x wp