From 2f37e700b38f40e1604d168af34c75af1316c8d0 Mon Sep 17 00:00:00 2001
From: Anatolii Zimovskii <azimovskii@saber3d.ru>
Date: Mon, 1 Nov 2021 18:55:05 +0300
Subject: [PATCH] redash release

---
 linux/advanced/redash/Dockerfile => Dockerfile | 10 +++++-----
 linux/advanced/redash/Makefile                 |  2 +-
 linux/advanced/redash/docker-compose.yml       |  2 +-
 linux/advanced/redash/redash-repo              |  1 -
 4 files changed, 7 insertions(+), 8 deletions(-)
 rename linux/advanced/redash/Dockerfile => Dockerfile (90%)
 delete mode 160000 linux/advanced/redash/redash-repo

diff --git a/linux/advanced/redash/Dockerfile b/Dockerfile
similarity index 90%
rename from linux/advanced/redash/Dockerfile
rename to Dockerfile
index 91b31195f..54e95f15c 100644
--- a/linux/advanced/redash/Dockerfile
+++ b/Dockerfile
@@ -12,8 +12,8 @@ RUN useradd -m -d /frontend redash
 USER redash
 
 WORKDIR /frontend
-COPY --chown=redash package.json yarn.lock .yarnrc /frontend/
-COPY --chown=redash viz-lib /frontend/viz-lib
+COPY --chown=redash ./redash-repo/package.json  ./redash-repo/yarn.lock  ./redash-repo/.yarnrc /frontend/
+COPY --chown=redash ./redash-repo/viz-lib /frontend/viz-lib
 
 # Controls whether to instrument code for coverage information
 ARG code_coverage
@@ -21,8 +21,8 @@ ENV BABEL_ENV=${code_coverage:+test}
 
 RUN if [ "x$skip_frontend_build" = "x" ] ; then yarn --frozen-lockfile --network-concurrency 1; fi
 
-COPY --chown=redash client /frontend/client
-COPY --chown=redash webpack.config.js /frontend/
+COPY --chown=redash ./redash-repo/client /frontend/client
+COPY --chown=redash ./redash-repo/webpack.config.js /frontend/
 RUN if [ "x$skip_frontend_build" = "x" ] ; then yarn build; else mkdir -p /frontend/client/dist && touch /frontend/client/dist/multi_org.html && touch /frontend/client/dist/index.html; fi
 
 FROM python:3.7-slim-buster
@@ -96,7 +96,7 @@ RUN if [ "x$skip_dev_deps" = "x" ] ; then pip install -r requirements_dev.txt ;
 COPY ./redash-repo/requirements.txt ./
 RUN pip install -r requirements.txt
 
-COPY . /app
+COPY ./redash-repo/ /app
 COPY --from=frontend-builder /frontend/client/dist /app/client/dist
 RUN chown -R redash /app
 USER redash
diff --git a/linux/advanced/redash/Makefile b/linux/advanced/redash/Makefile
index 5e2a7a25a..180c376ac 100644
--- a/linux/advanced/redash/Makefile
+++ b/linux/advanced/redash/Makefile
@@ -8,7 +8,6 @@ app:
 	make clean
 
 sync:
-	rm -rfv redash-repo
 	git submodule init
 	git submodule update --init --recursive
 	git submodule sync --recursive
@@ -23,6 +22,7 @@ push:
 	docker-compose push
 
 clean:
+	rm -rfv redash-repo
 	docker container prune -f
 	docker image prune -f
 	docker network prune -f
diff --git a/linux/advanced/redash/docker-compose.yml b/linux/advanced/redash/docker-compose.yml
index 5a89409da..814119cd5 100644
--- a/linux/advanced/redash/docker-compose.yml
+++ b/linux/advanced/redash/docker-compose.yml
@@ -3,4 +3,4 @@ services:
   app:
     image: "epicmorg/redash:latest"
     build:
-      context: .
+      context: ./redash-repo
diff --git a/linux/advanced/redash/redash-repo b/linux/advanced/redash/redash-repo
deleted file mode 160000
index 2e67227f1..000000000
--- a/linux/advanced/redash/redash-repo
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2e67227f1bb6068c3f23bc044ad76ef7d4bccdc7