Handle empty database password properly, don't try to run docker-compose inside the container

This commit is contained in:
Jyri-Petteri Paloposki 2020-07-19 21:30:24 +03:00
parent 53c7c94306
commit 85e104006c
7 changed files with 15 additions and 8 deletions

View file

@ -1,6 +1,6 @@
#!/usr/bin/env ruby
if File.exist?("#{__dir__}/../.use-docker")
exec("#{__dir__}/../script/docker-environment", $PROGRAM_NAME, *ARGV)
exec("#{__dir__}/../script/docker-environment", $PROGRAM_NAME, *ARGV) unless File.exist?("/etc/app-env")
end
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
load Gem.bin_path('bundler', 'bundle')

View file

@ -1,6 +1,6 @@
#!/usr/bin/env ruby
if File.exist?("#{__dir__}/../.use-docker")
exec("#{__dir__}/../script/docker-environment", $PROGRAM_NAME, *ARGV)
exec("#{__dir__}/../script/docker-environment", $PROGRAM_NAME, *ARGV) unless File.exist?("/etc/app-env")
end
APP_PATH = File.expand_path('../config/application', __dir__)

View file

@ -1,6 +1,6 @@
#!/usr/bin/env ruby
if File.exist?("#{__dir__}/../.use-docker")
exec("#{__dir__}/../script/docker-environment", $PROGRAM_NAME, *ARGV)
exec("#{__dir__}/../script/docker-environment", $PROGRAM_NAME, *ARGV) unless File.exist?("/etc/app-env")
end
require_relative '../config/boot'
require 'rake'

View file

@ -1,6 +1,6 @@
#!/usr/bin/env ruby
if File.exist?("#{__dir__}/../.use-docker")
exec("#{__dir__}/../script/docker-environment", $PROGRAM_NAME, *ARGV)
exec("#{__dir__}/../script/docker-environment", $PROGRAM_NAME, *ARGV) unless File.exist?("/etc/app-env")
end
# This file loads spring without using Bundler, in order to be fast