From 0ae04aa3d680d55c439d31697967e76bc6d35ad5 Mon Sep 17 00:00:00 2001 From: crazyoptimist Date: Sun, 29 Oct 2023 18:26:23 -0500 Subject: [PATCH] chore: remove test.env --- .github/workflows/build-lint.yaml | 1 + docker-compose.yaml | 4 ++-- test.env | 15 --------------- 3 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 test.env diff --git a/.github/workflows/build-lint.yaml b/.github/workflows/build-lint.yaml index 2954aca..6e79541 100644 --- a/.github/workflows/build-lint.yaml +++ b/.github/workflows/build-lint.yaml @@ -100,6 +100,7 @@ jobs: - name: Run Rubocop run: >- [ -f "db/schema.rb" ] && chmod 777 db/schema.rb; + cp .env.example .env; docker compose run -T web sh -c "bundle exec rubocop --parallel --format junit --out rubocop.xml" - name: Publish Linting Report diff --git a/docker-compose.yaml b/docker-compose.yaml index 9b6e12a..276d76f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -14,7 +14,7 @@ services: - "./:/app/" - "./log:/app/log" env_file: - - test.env + - .env ports: - "3000:3000" command: bash -c "rails s -b 0.0.0.0" @@ -25,7 +25,7 @@ services: db: image: postgres:14 env_file: - - test.env + - .env environment: - POSTGRES_DB=${DATABASE_NAME} - POSTGRES_PASSWORD=${DATABASE_PASSWORD} diff --git a/test.env b/test.env deleted file mode 100644 index 8516bf5..0000000 --- a/test.env +++ /dev/null @@ -1,15 +0,0 @@ -RAILS_ENV=development -RAILS_SECRET_TOKEN="replacemeasap" -RAILS_HOST_NAME=localhost:3000 - -BASE_URL=https://${RAILS_HOST_NAME} -# DATABASE_URL="postgres://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}/${DATABASE_NAME}?pool=30" -DATABASE_HOST=db -DATABASE_USER=postgres -DATABASE_PASSWORD=testing123 -DATABASE_NAME=slack_bot_dev - -SLACK_CLIENT_ID= -SLACK_CLIENT_SECRET= -SLACK_SIGNING_SECRET= -SLACK_OAUTH_SCOPE="users:read,channels:read,groups:read,chat:write,commands,incoming-webhook"