Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move docker files to superset sub dir #59

Merged
merged 1 commit into from
May 23, 2019
Merged

Move docker files to superset sub dir #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .env
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ superset-patch-dev: superset-clean
# Create docker image
.PHONY: superset-build
superset-build: superset-patch
docker build -t $(SUPERSET_IMAGE_NAME):$(VERSION) -f docker/Dockerfile .
docker build -t $(SUPERSET_IMAGE_NAME):$(VERSION) -f superset/contrib/docker/Dockerfile superset

# Push the superset docker image, based on .ci/Makefile.main
superset-docker-push: docker-login superset-build
Expand All @@ -68,7 +68,6 @@ superset-docker-push-latest-release:
.PHONY: superset-clean
superset-clean:
rm -f "$(SUPERSET_DIR)/superset_config.py"
rm -f "$(SUPERSET_DIR)/superset/superset_config.py"
git clean -fd $(SUPERSET_DIR)

# Add superset upstream remote if doesn't exists
Expand Down
73 changes: 0 additions & 73 deletions docker/Dockerfile
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions docker/docker-entrypoint.sh
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions docker/docker-init.sh
View file
Open in desktop

This file was deleted.

0 docker/add_gitbase.py → srcd/contrib/docker/add_gitbase.py
View file
Open in desktop
File renamed without changes.
103 changes: 0 additions & 103 deletions srcd/superset/superset_config.py
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions superset/contrib/docker/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +0,0 @@
#
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do you need to delete it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't rely on the contents of .env for a normal installation of sandbox-ce, so I wanted to notify this somehow here. If you add variables here, they will not have an effect on our final distribution.

# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
COMPOSE_PROJECT_NAME=superset
5 changes: 4 additions & 1 deletion superset/contrib/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ RUN pip install --upgrade setuptools pip \
COPY --chown=superset:superset superset superset

ENV PATH=/home/superset/superset/bin:$PATH \
PYTHONPATH=/home/superset/superset/:$PYTHONPATH
PYTHONPATH=/home/superset/:$PYTHONPATH \
SUPERSET_CONFIG_PATH=/home/superset/superset/superset_config.py

USER superset

Expand All @@ -63,7 +64,9 @@ RUN cd superset/assets \
&& npm run build \
&& rm -rf node_modules

COPY contrib/docker/superset_config.py ./superset/
COPY contrib/docker/docker-init.sh .
COPY contrib/docker/add_gitbase.py .
COPY contrib/docker/docker-entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]

Expand Down
2 changes: 1 addition & 1 deletion superset/contrib/docker/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ elif [ "$SUPERSET_ENV" = "production" ]; then
celery worker --app=superset.sql_lab:celery_app --pool=gevent -Ofair &
gunicorn --bind 0.0.0.0:8088 \
--workers $((2 * $(getconf _NPROCESSORS_ONLN) + 1)) \
--timeout 60 \
--timeout 300 \
--limit-request-line 0 \
--limit-request-field_size 0 \
superset:app
Expand Down
3 changes: 3 additions & 0 deletions superset/contrib/docker/docker-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,6 @@ fi

# Create default roles and permissions
superset init

# Add gitbase
python add_gitbase.py
Loading