From 02b27467b68d6682729ad4b433bfebe489a1081d Mon Sep 17 00:00:00 2001
From: Erik De Rijcke <derijcke.erik@gmail.com>
Date: Thu, 2 Nov 2023 22:12:33 +0100
Subject: [PATCH] more wip

---
 .dockerignore                            | 1 +
 docker/Dockerfile                        | 7 ++++---
 docker/docker-entrypoint.sh              | 2 +-
 packages/compositor-proxy-cli/.gitignore | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index af3034f0..18865a6c 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -26,6 +26,7 @@ packages/compositor-proxy/.eslintrc.js
 packages/compositor-proxy/.prettierrc.js
 packages/compositor-proxy/jest.config.js
 packages/compositor-proxy-cli/dist/
+packages/compositor-proxy-cli/package/
 packages/compositor-proxy-cli/node_modules/
 packages/compositor-proxy-cli/.eslintrc.js
 packages/compositor-proxy-cli/.prettierrc.js
diff --git a/docker/Dockerfile b/docker/Dockerfile
index aed4ce64..ebfe717d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -8,18 +8,19 @@ WORKDIR /app
 
 COPY ["package.json", "yarn.lock", ".yarnrc.yml", "./"]
 COPY [".yarn/", "./.yarn/"]
-COPY ["libs/xtsb/package.json", "./libs/xtsb/package.json"]
+
 COPY ["libs/compositor-proxy-generator/package.json", "./libs/compositor-proxy-generator/package.json"]
-COPY ["packages/compositor-proxy/package.json", "./packages/compositor-proxy/package.json"]
-COPY ["packages/compositor-proxy-cli/package.json", "./packages/compositor-proxy-cli/package.json"]
 
+COPY ["libs/xtsb/package.json", "./libs/xtsb/package.json"]
 COPY ["libs/xtsb/tsconfig.json", "libs/xtsb/tsconfig.node.json", "./libs/xtsb/"]
 COPY ["libs/xtsb/src/", "./libs/xtsb/src/"]
 
+COPY ["packages/compositor-proxy/package.json", "./packages/compositor-proxy/package.json"]
 COPY ["packages/compositor-proxy/tsconfig.json", "packages/compositor-proxy/CMakeLists.txt", "./packages/compositor-proxy/"]
 COPY ["packages/compositor-proxy/native/", "./packages/compositor-proxy/native/"]
 COPY ["packages/compositor-proxy/src/", "./packages/compositor-proxy/src/"]
 
+COPY ["packages/compositor-proxy-cli/package.json", "./packages/compositor-proxy-cli/package.json"]
 COPY ["packages/compositor-proxy-cli/tsconfig.json", "./packages/compositor-proxy-cli/"]
 COPY ["packages/compositor-proxy-cli/src/", "./packages/compositor-proxy-cli/src/"]
 
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 6031112f..cdefb7b6 100644
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -2,4 +2,4 @@
 set -e
 touch "$XAUTHORITY"
 xauth add "${HOST}":1 . "$(xxd -l 16 -p /dev/urandom)"
-. ./compositor-proxy-cli "$@"
\ No newline at end of file
+./compositor-proxy-cli "$@"
\ No newline at end of file
diff --git a/packages/compositor-proxy-cli/.gitignore b/packages/compositor-proxy-cli/.gitignore
index c2a7c58b..19e00606 100644
--- a/packages/compositor-proxy-cli/.gitignore
+++ b/packages/compositor-proxy-cli/.gitignore
@@ -1,3 +1,3 @@
 dist
 node_modules
-package/compositor-proxy-cli
+package/