From 0546e1f9d2dc5e6a0814749aacc7a0eb49cba4b6 Mon Sep 17 00:00:00 2001 From: Danil Lugovskoy Date: Sun, 10 Jan 2021 19:59:53 +0300 Subject: [PATCH] Update git --- .dockerignore | 1 + .gitignore | 1 + docker-compose-runner.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.dockerignore b/.dockerignore index a308d670cf..2c2afea33b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -6,6 +6,7 @@ !docker/ci-integration-test/entrypoint.sh !docker/zk/entrypoint.sh !etc/env/dev.env.example +!etc/env/docker.env !etc/tokens !keys/packed !docker/nginx/nginx.conf diff --git a/.gitignore b/.gitignore index 8d757766dd..87eb593c43 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ Cargo.lock /etc/env/* !/etc/env/dev.env.example +!/etc/env/docker.env !/etc/env/ci.env /etc/tokens/localhost.json !/keys diff --git a/docker-compose-runner.yml b/docker-compose-runner.yml index c3b070e6cd..dc83281e5f 100644 --- a/docker-compose-runner.yml +++ b/docker-compose-runner.yml @@ -38,3 +38,4 @@ services: environment: - IN_DOCKER=true - CACHE_DIR=/usr/src/cache + - CI=1