gitIgnore .env files

takikadiri · Dec 2, 2021 · c43ec40 · c43ec40
1 parent be2d46e
commit c43ec40
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,6 +27,9 @@
 .idea/
 .vscode/
 
+### Configuration files that may inculde sensitive information
+.env
+
 # End of https://www.gitignore.io/api/go
 
 # Our binaries

diff --git a/deployments/compose/README.md b/deployments/compose/README.md
@@ -19,6 +19,12 @@ The docker-compose also runs the setup stage and configures admin user with the
 * Access key ID: `AKIAIOSFODNN7EXAMPLE`
 * Secret access key: `wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY` 
 
+
+#### How to override env vars values 
+
+To avoid undesired secrets leak into the public repository, it is recommended to override environment variables values by
+creating a [.env](https://docs.docker.com/compose/environment-variables/#the-env-file) file under `/deployments/compose`.
+
 ### Hive Client
 
 Can access Hive Server using client, run under 'client' profile:

diff --git a/nessie/ops/.env b/nessie/ops/.env
diff --git a/nessie/ops/docker-compose.yaml b/nessie/ops/docker-compose.yaml
@@ -1,15 +1,15 @@
 version: '3'
 services:
   lakefs:
-    image: "${REPO}/lakefs:${TAG}"
+    image: "${REPO:-treeverse}/lakefs:${TAG:-dev}"
     ports:
       - "8000:8000"
     depends_on:
       - "postgres"
     environment:
       - LAKEFS_AUTH_ENCRYPT_SECRET_KEY=some random secret string
       - LAKEFS_DATABASE_CONNECTION_STRING=postgres://lakefs:lakefs@postgres/postgres?sslmode=disable
-      - LAKEFS_BLOCKSTORE_TYPE=${LAKEFS_BLOCKSTORE_TYPE}
+      - LAKEFS_BLOCKSTORE_TYPE=${LAKEFS_BLOCKSTORE_TYPE:-local}
       - LAKEFS_BLOCKSTORE_LOCAL_PATH=/home/lakefs
       - LAKEFS_BLOCKSTORE_S3_CREDENTIALS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
       - LAKEFS_BLOCKSTORE_S3_CREDENTIALS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
@@ -54,5 +54,5 @@ volumes:
     driver_opts:
       o: bind
       type: none
-      device: ${LAKEFS_ROOT}
+      device: ${LAKEFS_ROOT:-.}
 
diff --git a/test/spark/.env b/test/spark/.env
diff --git a/test/spark/docker-compose.yaml b/test/spark/docker-compose.yaml
@@ -8,7 +8,7 @@ services:
       POSTGRES_USER: lakefs
       POSTGRES_PASSWORD: lakefs
   lakefs:
-    image: "${REPO}/lakefs:${TAG}"
+    image: "${REPO:-treeverse}/lakefs:${TAG:-latest}"
     ports:
       - "8000:8000"
     networks:
@@ -36,7 +36,7 @@ services:
         - tester.env
     entrypoint: ["/app/wait-for", "postgres:5432", "--", "/app/lakefs", "run"]
   spark:
-    image: docker.io/bitnami/spark:${SPARK_TAG}
+    image: docker.io/bitnami/spark:${SPARK_TAG:-3}
     environment:
       - SPARK_MODE=master
       - SPARK_MASTER_HOST=spark
@@ -58,7 +58,7 @@ services:
       - "gateway-test.s3.docker.lakefs.io:10.5.0.55"
       - "thick-client-test.s3.docker.lakefs.io:10.5.0.55"
   spark-worker:
-    image: docker.io/bitnami/spark:${SPARK_TAG}
+    image: docker.io/bitnami/spark:${SPARK_TAG:-3}
     ports:
       - 8081
     environment:
@@ -84,7 +84,7 @@ services:
       - "gateway-test.s3.docker.lakefs.io:10.5.0.55"
       - "thick-client-test.s3.docker.lakefs.io:10.5.0.55"
   spark-submit:
-    image: docker.io/bitnami/spark:${SPARK_TAG}
+    image: docker.io/bitnami/spark:${SPARK_TAG:-3}
     profiles: ["command"]
     volumes:
       - ./:/local