From 522880a0abe23db7b5591f6df8ed0a3d03d26b74 Mon Sep 17 00:00:00 2001
From: Imbris <imbrisf@gmail.com>
Date: Mon, 5 Oct 2020 04:48:29 -0400
Subject: [PATCH] Update CI and docker files to work with changes to data
 folder structure

---
 .gitlab/CI/build.gitlab-ci.yml | 6 +++---
 server-cli/docker-compose.yml  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab/CI/build.gitlab-ci.yml b/.gitlab/CI/build.gitlab-ci.yml
index 011dda3f81..0a3f2bc637 100644
--- a/.gitlab/CI/build.gitlab-ci.yml
+++ b/.gitlab/CI/build.gitlab-ci.yml
@@ -34,7 +34,7 @@ benchmarks:
 .tlinux:
   script:
     - ln -s /dockercache/cache-release-linux target
-    - cargo build --release
+    - VELOREN_USERDATA_STRATEGY=executable cargo build --release
     - cp -r target/release/veloren-server-cli $CI_PROJECT_DIR
     - cp -r target/release/veloren-voxygen $CI_PROJECT_DIR
   artifacts:
@@ -48,7 +48,7 @@ benchmarks:
 .twindows:
   script:
     - ln -s /dockercache/cache-release-windows target
-    - cargo build --target=x86_64-pc-windows-gnu --release
+    - VELOREN_USERDATA_STRATEGY=executable cargo build --target=x86_64-pc-windows-gnu --release
     - cp -r target/x86_64-pc-windows-gnu/release/veloren-server-cli.exe $CI_PROJECT_DIR
     - cp -r target/x86_64-pc-windows-gnu/release/veloren-voxygen.exe $CI_PROJECT_DIR
   artifacts:
@@ -62,7 +62,7 @@ benchmarks:
 .tmacos:
   script:
     - ln -s /dockercache/cache-release-macos target
-    - PATH="/dockercache/osxcross/target/bin:$PATH" COREAUDIO_SDK_PATH=/dockercache/osxcross/target/SDK/MacOSX10.13.sdk CC=o64-clang CXX=o64-clang++ cargo build --target x86_64-apple-darwin --release
+    - VELOREN_USERDATA_STRATEGY=executable PATH="/dockercache/osxcross/target/bin:$PATH" COREAUDIO_SDK_PATH=/dockercache/osxcross/target/SDK/MacOSX10.13.sdk CC=o64-clang CXX=o64-clang++ cargo build --target x86_64-apple-darwin --release
     - cp -r target/x86_64-apple-darwin/release/veloren-server-cli $CI_PROJECT_DIR
     - cp -r target/x86_64-apple-darwin/release/veloren-voxygen $CI_PROJECT_DIR
   artifacts:
diff --git a/server-cli/docker-compose.yml b/server-cli/docker-compose.yml
index 355ea0f304..93baaab42a 100644
--- a/server-cli/docker-compose.yml
+++ b/server-cli/docker-compose.yml
@@ -9,7 +9,7 @@ services:
       - "14005:14005"
     restart: on-failure:0
     volumes:
-        - "./saves:/opt/saves"
+        - "./userdata:/opt/userdata"
     environment:
         - RUST_LOG=debug,common::net=info
   watchtower: