Skip to content

Commit a23a4ed

Browse files
authored
refactor: rename docker-compose files and update references (#33790)
Signed-off-by: Vladislav Polyakov <[email protected]>
1 parent 63cb580 commit a23a4ed

File tree

14 files changed

+21
-21
lines changed

14 files changed

+21
-21
lines changed

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,4 +134,4 @@ jobs:
134134
if: steps.check.outputs.docker
135135
shell: bash
136136
run: |
137-
docker compose -f docker-compose-image-tag.yml up superset-init --exit-code-from superset-init
137+
docker compose -f compose-image-tag.yml up superset-init --exit-code-from superset-init

.github/workflows/superset-python-presto-hive.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ jobs:
125125
run: sudo chown -R $USER:$USER /tmp/.superset
126126
- name: Start hadoop and hive
127127
if: steps.check.outputs.python
128-
run: docker compose -f scripts/databases/hive/docker-compose.yml up -d
128+
run: docker compose -f scripts/databases/hive/compose.yml up -d
129129
- name: Setup Python
130130
uses: ./.github/actions/setup-backend/
131131
if: steps.check.outputs.python
File renamed without changes.
File renamed without changes.
File renamed without changes.

docker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Don't forget to reload the page to take the new frontend into account though.
6868

6969
## Production
7070

71-
It is possible to run Superset in non-development mode by using [`docker-compose-non-dev.yml`](../docker-compose-non-dev.yml). This file excludes the volumes needed for development.
71+
It is possible to run Superset in non-development mode by using [`compose-non-dev.yml`](../compose-non-dev.yml). This file excludes the volumes needed for development.
7272

7373
## Resource Constraints
7474

docs/docs/configuration/alerts-reports.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Note: All the components required (Firefox headless browser, Redis, Postgres db,
4242
All you need to do is add the required config variables described in this guide (See `Detailed Config`).
4343

4444
If you are running a non-dev docker image, e.g., a stable release like `apache/superset:3.1.0`, that image does not include a headless browser. Only the `superset_worker` container needs this headless browser to browse to the target chart or dashboard.
45-
You can either install and configure the headless browser - see "Custom Dockerfile" section below - or when deploying via `docker compose`, modify your `docker-compose.yml` file to use a dev image for the worker container and a stable release image for the `superset_app` container.
45+
You can either install and configure the headless browser - see "Custom Dockerfile" section below - or when deploying via `docker compose`, modify your `compose.yml` file to use a dev image for the worker container and a stable release image for the `superset_app` container.
4646

4747
*Note*: In this context, a "dev image" is the same application software as its corresponding non-dev image, just bundled with additional tools. So an image like `3.1.0-dev` is identical to `3.1.0` when it comes to stability, functionality, and running in production. The actual "in-development" versions of Superset - cutting-edge and unstable - are not tagged with version numbers on Docker Hub and will display version `0.0.0-dev` within the Superset UI.
4848

@@ -74,7 +74,7 @@ Note: when you configure an alert or a report, the Slack channel list takes chan
7474

7575
### Docker Compose specific
7676

77-
#### You must have in your `docker-compose.yml`
77+
#### You must have in your `compose.yml`
7878

7979
- A Redis message broker
8080
- PostgreSQL DB instead of SQLlite

docs/docs/configuration/databases.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ into the container from PyPI at runtime. This file will be ignored by Git for
127127
the purposes of local development.
128128

129129
Create the file `requirements-local.txt` in a subdirectory called `docker` that
130-
exists in the directory with your `docker-compose.yml` or `docker-compose-non-dev.yml` file.
130+
exists in the directory with your `compose.yml` or `compose-non-dev.yml` file.
131131

132132
```bash
133133
# Run from the repo root:
@@ -142,7 +142,7 @@ echo "mysqlclient" >> ./docker/requirements-local.txt
142142
```
143143

144144
**If you are running a stock (non-customized) Superset image**, you are done.
145-
Launch Superset with `docker compose -f docker-compose-non-dev.yml up` and
145+
Launch Superset with `docker compose -f compose-non-dev.yml up` and
146146
the driver should be present.
147147

148148
You can check its presence by entering the running container with

docs/docs/contributing/development.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Note that:
4949
- **Redis** as the message queue for our async backend and caching backend
5050
- It'll load up examples into the database upon the first startup
5151
- all other details and pointers available in
52-
[docker-compose.yml](https://github.com/apache/superset/blob/master/docker-compose.yml)
52+
[compose.yml](https://github.com/apache/superset/blob/master/compose.yml)
5353
- The local repository is mounted within the services, meaning updating
5454
the code on the host will be reflected in the docker images
5555
- Superset is served at localhost:9000/

docs/docs/installation/docker-compose.mdx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ way to launch a fully functioning **development environment** quickly.
2828

2929
Note that there are 3 major ways we support to run `docker compose`:
3030

31-
1. **docker-compose.yml:** for interactive development, where we mount your local folder with the
31+
1. **compose.yml:** for interactive development, where we mount your local folder with the
3232
frontend/backend files that you can edit and experience the changes you
3333
make in the app in real time
34-
1. **docker-compose-non-dev.yml** where we just build a more immutable image based on the
34+
1. **compose-non-dev.yml** where we just build a more immutable image based on the
3535
local branch and get all the required images running. Changes in the local branch
3636
at the time you fire this up will be reflected, but changes to the code
3737
while `up` won't be reflected in the app
38-
1. **docker-compose-image-tag.yml** where we fetch an image from docker-hub say for the
38+
1. **compose-image-tag.yml** where we fetch an image from docker-hub say for the
3939
`3.0.0` release for instance, and fire it up so you can try it. Here what's in
4040
the local branch has no effects on what's running, we just fetch and run
4141
pre-built images from docker-hub. For `docker compose` to work along with the
@@ -106,7 +106,7 @@ from within docker. This will slow down the startup, but will fix various npm-re
106106
### Option #2 - build a set of immutable images from the local branch
107107

108108
```bash
109-
docker compose -f docker-compose-non-dev.yml up
109+
docker compose -f compose-non-dev.yml up
110110
```
111111

112112
### Option #3 - boot up an official release
@@ -121,7 +121,7 @@ git fetch --depth=1 origin tag $TAG
121121
# Checkout the corresponding git ref
122122
git checkout $TAG
123123
# Fire up docker compose
124-
docker compose -f docker-compose-image-tag.yml up
124+
docker compose -f compose-image-tag.yml up
125125
```
126126

127127
Here various release tags, github SHA, and latest `master` can be referenced by the TAG env var.
@@ -179,7 +179,7 @@ that the logic runs a `from superset_config_docker import *`
179179

180180
:::note
181181
Users often want to connect to other databases from Superset. Currently, the easiest way to
182-
do this is to modify the `docker-compose-non-dev.yml` file and add your database as a service that
182+
do this is to modify the `compose-non-dev.yml` file and add your database as a service that
183183
the other services depend on (via `x-superset-depends-on`). Others have attempted to set
184184
`network_mode: host` on the Superset services, but these generally break the installation,
185185
because the configuration requires use of the Docker Compose DNS resolver for the service names.
@@ -193,8 +193,8 @@ decisions about patching and long-term support. Scarf purges personally identifi
193193
(PII) and provides only aggregated statistics.
194194

195195
To opt-out of this data collection for packages downloaded through the Scarf Gateway by your docker
196-
compose based installation, edit the `x-superset-image:` line in your `docker-compose.yml` and
197-
`docker-compose-non-dev.yml` files, replacing `apachesuperset.docker.scarf.sh/apache/superset` with
196+
compose based installation, edit the `x-superset-image:` line in your `compose.yml` and
197+
`compose-non-dev.yml` files, replacing `apachesuperset.docker.scarf.sh/apache/superset` with
198198
`apache/superset` to pull the image directly from Docker Hub.
199199

200200
To disable the Scarf telemetry pixel, set the `SCARF_ANALYTICS` environment variable to `False` in
@@ -257,4 +257,4 @@ When running `docker compose up`, docker will build what is required behind the
257257
may use the docker cache if assets already exist. Running `docker compose build` prior to
258258
`docker compose up` or the equivalent shortcut `docker compose up --build` ensures that your
259259
docker images matche the definition in the repository. This should only apply to the main
260-
docker-compose.yml file (default) and not to the alternative methods defined above.
260+
compose.yml file (default) and not to the alternative methods defined above.

docs/docs/installation/installation-methods.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The fundamental trade-off is between you needing to do more of the detail work y
1919

2020
If you're not just demoing the software, you'll need a moderate understanding of Docker to customize your deployment and avoid a few risks. Even when fully-optimized this is not as robust a method as Kubernetes when it comes to large-scale production deployments.
2121

22-
You manage a superset-config.py file and a docker-compose.yml file. Docker Compose brings up all the needed services - the Superset application, a Postgres metadata DB, Redis cache, Celery worker and beat. They are automatically connected to each other.
22+
You manage a superset-config.py file and a compose.yml file. Docker Compose brings up all the needed services - the Superset application, a Postgres metadata DB, Redis cache, Celery worker and beat. They are automatically connected to each other.
2323

2424
**Responsibilities**
2525

docs/docs/quickstart.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ $ cd superset
3535
$ git checkout tags/4.1.2
3636

3737
# Fire up Superset using Docker Compose
38-
$ docker compose -f docker-compose-image-tag.yml up
38+
$ docker compose -f compose-image-tag.yml up
3939
```
4040

4141
This may take a moment as Docker Compose will fetch the underlying
4242
container images and will load up some examples. Once all containers
4343
are downloaded and the output settles, you're ready to log in.
4444

45-
⚠️ If you get an error message like `validating superset\docker-compose-image-tag.yml: services.superset-worker-beat.env_file.0 must be a string`, you need to update your version of `docker-compose`.
45+
⚠️ If you get an error message like `validating superset\compose-image-tag.yml: services.superset-worker-beat.env_file.0 must be a string`, you need to update your version of `docker-compose`.
4646
Note that `docker-compose` is on the path to deprecation and you should now use `docker compose` instead.
4747

4848
### 3. Log into Superset

scripts/tests/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ under the License.
1919

2020
# Utility script to run tests faster
2121

22-
By default tests will be run using the Postgres container defined at the `docker compose` file (`docker-compose.yml`) on the root of the repo,
22+
By default tests will be run using the Postgres container defined at the `docker compose` file (`compose.yml`) on the root of the repo,
2323
so prior to using this script make sure to launch the dev containers.
2424

2525
You can use a different DB backend by defining `SUPERSET__SQLALCHEMY_DATABASE_URI` env var.

0 commit comments

Comments
 (0)