From 839731d5d5c31f7e2eaf17069fcd979c5a474354 Mon Sep 17 00:00:00 2001
From: Yehonal <yehonal.azeroth@gmail.com>
Date: Mon, 7 Nov 2022 17:44:47 +0100
Subject: [PATCH] fix(CORE/docker): client data image deployment

---
 .github/workflows/docker_build.yml | 2 +-
 apps/docker/Dockerfile             | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml
index b3611ade6..cac3b23dc 100644
--- a/.github/workflows/docker_build.yml
+++ b/.github/workflows/docker_build.yml
@@ -167,5 +167,5 @@ jobs:
         with:
           token: ${{ secrets.ACORE_DOCKER_REPO_ACCESS_TOKEN }}
           repository: azerothcore/acore-docker
-          # event-type: my-event
+          event-type: azerothcore-new-images
           client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
diff --git a/apps/docker/Dockerfile b/apps/docker/Dockerfile
index 2919700ed..63f68d834 100644
--- a/apps/docker/Dockerfile
+++ b/apps/docker/Dockerfile
@@ -279,12 +279,15 @@ RUN addgroup --gid $GROUP_ID acore && \
     passwd -d acore && \
     echo 'acore ALL=(ALL:ALL) NOPASSWD: ALL' >> /etc/sudoers
 
-ENV DATAPATH=/azerothcore/env/dist/data
+ENV DATAPATH=/azerothcore/env/dist/data-temp
 ENV DATAPATH_ZIP=/tmp/data.zip
 
 RUN mkdir -p "$DATAPATH"
+RUN mkdir -p "/azerothcore/env/dist/data"
 ARG CACHEBUST=1
-RUN --mount=type=bind,target=/azerothcore-temp,readwrite --mount=type=cache,target=/azerothcore/env/dist/data /azerothcore-temp/acore.sh client-data && chown -R $DOCKER_USER:$DOCKER_USER /azerothcore
+RUN --mount=type=bind,target=/azerothcore-temp,readwrite --mount=type=cache,target=/azerothcore/env/dist/data-temp /azerothcore-temp/acore.sh client-data && cp -rT /azerothcore/env/dist/data-temp/ /azerothcore/env/dist/data && chown -R $DOCKER_USER:$DOCKER_USER /azerothcore
+
+ENV DATAPATH=/azerothcore/env/dist/data
 
 USER $DOCKER_USER