Rename stencil and Docker envs to env.template and env.docker res…

…pectively
WordPress · Sep 28, 2021 · c3c1d1d · c3c1d1d
1 parent 0fc78d3
commit c3c1d1d
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -51,7 +51,7 @@ jobs:
     - name: Run API tests
       working-directory: ./openverse_api
       env:
-        PIPENV_DOTENV_LOCATION: ./.env.stencil
+        PIPENV_DOTENV_LOCATION: ./env.template
       run: pipenv run test/run_test.sh
     - name: Run analytics tests
       working-directory: ./analytics

diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ This repository is primarily concerned with back end infrastructure like datasto
    cd openverse-api/
    ```
 
-3. From the monorepo root, bring up the Docker Compose system. Docker Compose will automatically read the necessary environment variables from `.env.docker` files from project directories.
+3. From the monorepo root, bring up the Docker Compose system. Docker Compose will automatically read the necessary environment variables from `env.docker` files from project directories.
    ```bash
    just up
    ```

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     ports:
       - "5432:5432"
     env_file:
-      - postgres/.env.docker
+      - postgres/env.docker
     healthcheck:
       test: "pg_isready -U deploy -d openledger"
 
@@ -22,7 +22,7 @@ services:
     volumes:
       - ./sample_data:/sample_data
     env_file:
-      - postgres/.env.docker
+      - postgres/env.docker
     healthcheck:
       test: "pg_isready -U deploy -d openledger"
 
@@ -59,7 +59,7 @@ services:
       - es
       - cache
     env_file:
-      - openverse_api/.env.docker
+      - openverse_api/env.docker
     stdin_open: true
     tty: true
 
@@ -80,7 +80,7 @@ services:
     volumes:
       - ./ingestion_server:/ingestion_server
     env_file:
-      - ingestion_server/.env.docker
+      - ingestion_server/env.docker
     stdin_open: true
     tty: true
 
@@ -96,7 +96,7 @@ services:
     volumes:
       - ./ingestion_server:/ingestion_server
     env_file:
-      - ingestion_server/.env.docker
+      - ingestion_server/env.docker
     stdin_open: true
     tty: true
 

diff --git a/ingestion_server/README.md b/ingestion_server/README.md
@@ -57,7 +57,7 @@ will be `"INGEST_UPSTREAM"`.
 
 ## Configuration
 
-All configuration is performed through environment variables. See the `.env.stencil` file for a comprehensive list of all environment variables. The ones with sane defaults have been commented out.
+All configuration is performed through environment variables. See the `env.template` file for a comprehensive list of all environment variables. The ones with sane defaults have been commented out.
 
 Pipenv will automatically load `.env` files when running commands with `pipenv run`.
 

diff --git a/ingestion_server/.env.docker → ingestion_server/env.docker b/ingestion_server/.env.docker → ingestion_server/env.docker
diff --git a/ingestion_server/.env.stencil → ingestion_server/env.template b/ingestion_server/.env.stencil → ingestion_server/env.template
diff --git a/justfile b/justfile
@@ -30,8 +30,8 @@ logs services="":
 
 # Create .env files from stencils
 env:
-    cp openverse_api/.env.stencil openverse_api/.env
-    cp ingestion_server/.env.stencil ingestion_server/.env
+    cp openverse_api/env.template openverse_api/.env
+    cp ingestion_server/env.template ingestion_server/.env
 
 # Load sample data into the Docker Compose services
 init: up

diff --git a/openverse_api/README.md b/openverse_api/README.md
@@ -54,7 +54,7 @@ You can view the custom administration views at the `/admin/` endpoint. You can
 
 ## Configuration
 
-All configuration is performed through environment variables. See the `.env.stencil` file for a comprehensive list of all environment variables. The ones with sane defaults have been commented out.
+All configuration is performed through environment variables. See the `env.template` file for a comprehensive list of all environment variables. The ones with sane defaults have been commented out.
 
 Pipenv will automatically load `.env` files when running commands with `pipenv run`.
 

diff --git a/openverse_api/.env.docker → openverse_api/env.docker b/openverse_api/.env.docker → openverse_api/env.docker
diff --git a/openverse_api/.env.stencil → openverse_api/env.template b/openverse_api/.env.stencil → openverse_api/env.template
diff --git a/postgres/.env.docker → postgres/env.docker b/postgres/.env.docker → postgres/env.docker
-Original file line number
+Diff line change
@@ Expand Up @@
        cd openverse-api/
        ```
-. From the monorepo root, bring up the Docker Compose system. Docker Compose will automatically read the necessary environment variables from `.env.docker` files from project directories.
+. From the monorepo root, bring up the Docker Compose system. Docker Compose will automatically read the necessary environment variables from `env.docker` files from project directories.
        ```bash
        just up
        ```
@@ Expand Down @@