Skip to content

Commit

Permalink
fix(docker): superset permissions and firefox config (#14736)
Browse files Browse the repository at this point in the history
* fix(docker): superset permissions and firefox config

* fix lint

* user SUPERSET_HOME ENV on bootstrap script
  • Loading branch information
dpgaspar committed May 26, 2021
1 parent 0c0eccb commit d46aa60
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 14 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ ENV LANG=C.UTF-8 \
SUPERSET_HOME="/app/superset_home" \
SUPERSET_PORT=8088

RUN useradd --user-group --no-create-home --no-log-init --shell /bin/bash superset \
&& mkdir -p ${SUPERSET_HOME} ${PYTHONPATH} \
RUN useradd --user-group -d ${SUPERSET_HOME} --no-log-init --shell /bin/bash superset \
&& mkdir -p ${PYTHONPATH} \
&& apt-get update -y \
&& apt-get install -y --no-install-recommends \
build-essential \
Expand Down
11 changes: 6 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
# limitations under the License.
#
x-superset-image: &superset-image apache/superset:latest-dev
x-superset-user: &superset-user root
x-superset-depends-on: &superset-depends-on
- db
- redis
Expand Down Expand Up @@ -55,7 +56,7 @@ services:
restart: unless-stopped
ports:
- 8088:8088
user: "root"
user: *superset-user
depends_on: *superset-depends-on
volumes: *superset-volumes
environment:
Expand Down Expand Up @@ -95,7 +96,7 @@ services:
command: ["/app/docker/docker-init.sh"]
env_file: docker/.env
depends_on: *superset-depends-on
user: "root"
user: *superset-user
volumes: *superset-volumes
environment:
CYPRESS_CONFIG: "${CYPRESS_CONFIG}"
Expand All @@ -115,7 +116,7 @@ services:
env_file: docker/.env
restart: unless-stopped
depends_on: *superset-depends-on
user: "root"
user: *superset-user
volumes: *superset-volumes

superset-worker-beat:
Expand All @@ -125,7 +126,7 @@ services:
env_file: docker/.env
restart: unless-stopped
depends_on: *superset-depends-on
user: "root"
user: *superset-user
volumes: *superset-volumes

superset-tests-worker:
Expand All @@ -141,7 +142,7 @@ services:
REDIS_HOST: localhost
network_mode: host
depends_on: *superset-depends-on
user: "root"
user: *superset-user
volumes: *superset-volumes

volumes:
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ if [[ "${1}" == "worker" ]]; then
celery worker --app=superset.tasks.celery_app:app -Ofair -l INFO
elif [[ "${1}" == "beat" ]]; then
echo "Starting Celery beat..."
celery beat --app=superset.tasks.celery_app:app --pidfile /tmp/celerybeat.pid -l INFO
celery beat --app=superset.tasks.celery_app:app --pidfile /tmp/celerybeat.pid -l INFO -s "${SUPERSET_HOME}"/celerybeat-schedule
elif [[ "${1}" == "app" ]]; then
echo "Starting web app..."
flask run -p 8088 --with-threads --reload --debugger --host=0.0.0.0
Expand Down
8 changes: 2 additions & 6 deletions superset/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -1028,16 +1028,12 @@ def CSV_TO_HIVE_UPLOAD_DIRECTORY_FUNC(
WEBDRIVER_AUTH_FUNC = None

# Any config options to be passed as-is to the webdriver
WEBDRIVER_CONFIGURATION: Dict[Any, Any] = {}
WEBDRIVER_CONFIGURATION: Dict[Any, Any] = {"service_log_path": "/dev/null"}

# Additional args to be passed as arguments to the config object
# Note: these options are Chrome-specific. For FF, these should
# only include the "--headless" arg
WEBDRIVER_OPTION_ARGS = [
"--force-device-scale-factor=2.0",
"--high-dpi-support=2.0",
"--headless",
]
WEBDRIVER_OPTION_ARGS = ["--headless", "--marionette"]

# The base URL to query for accessing the user interface
WEBDRIVER_BASEURL = "http://0.0.0.0:8080/"
Expand Down

0 comments on commit d46aa60

Please sign in to comment.