Permalink
Browse files

Remove references to rd_ui

  • Loading branch information...
1 parent c029e13 commit 68ccf4b13a6277c23bddd6710ea6862b7889196d @arikfr arikfr committed Nov 26, 2016
View
@@ -1,4 +1,4 @@
-rd_ui/.tmp/
-rd_ui/node_modules/
+client/.tmp/
+client/node_modules/
.git/
.vagrant/
View
@@ -2,7 +2,7 @@
.idea
*.pyc
.coverage
-rd_ui/dist
+client/dist
.DS_Store
celerybeat-schedule*
.#*
@@ -26,5 +26,4 @@ docker-compose.yml
node_modules
.tmp
.sass-cache
-rd_ui/app/bower_components
npm-debug.log
View
@@ -23,16 +23,14 @@ RUN chown -R redash /opt/redash/current
# Setting working directory
WORKDIR /opt/redash/current
-ENV REDASH_STATIC_ASSETS_PATH="../rd_ui/dist/"
-
# Install project specific dependencies
RUN pip install -r requirements_all_ds.txt && \
pip install -r requirements.txt
RUN curl https://deb.nodesource.com/setup_4.x | bash - && \
apt-get install -y nodejs && \
sudo -u redash -H make deps && \
- rm -rf node_modules rd_ui/node_modules /home/redash/.npm /home/redash/.cache && \
+ rm -rf node_modules client/node_modules /home/redash/.npm /home/redash/.cache && \
apt-get purge -y nodejs && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
@@ -6,7 +6,6 @@ redash:
- redis
- postgres
environment:
- REDASH_STATIC_ASSETS_PATH: "../rd_ui/dist/"
REDASH_LOG_LEVEL: "INFO"
REDASH_REDIS_URL: "redis://redis:6379/0"
REDASH_DATABASE_URL: "postgresql://postgres@postgres/postgres"
@@ -1,4 +1,3 @@
-export REDASH_STATIC_ASSETS_PATH="../rd_ui/dist/"
export REDASH_LOG_LEVEL="INFO"
export REDASH_REDIS_URL=redis://localhost:6379/1
export REDASH_DATABASE_URL="postgresql://redash"
@@ -1,4 +1,3 @@
-export REDASH_STATIC_ASSETS_PATH="../rd_ui/dist/"
export REDASH_LOG_LEVEL="INFO"
export REDASH_REDIS_URL=redis://localhost:6379/0
export REDASH_DATABASE_URL="postgresql://redash"
@@ -6,7 +6,6 @@ redash:
- redis
- postgres
environment:
- REDASH_STATIC_ASSETS_PATH: ../rd_ui/dist/
REDASH_LOG_LEVEL: INFO
REDASH_REDIS_URL: redis://redis:6379/0
REDASH_DATABASE_URL: postgresql://postgres@postgres/postgres

0 comments on commit 68ccf4b

Please sign in to comment.