diff options
| -rw-r--r-- | .dockerignore | 20 | ||||
| -rw-r--r-- | Dockerfile.build | 37 | ||||
| -rw-r--r-- | config/database.yml.docker | 2 | ||||
| -rw-r--r-- | lib/tasks/ci.rake | 26 |
4 files changed, 80 insertions, 5 deletions
diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..150fbd629 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,20 @@ +.git +Dockerfile +.DS_Store +.gitignore +README.md + +public/javascripts/i18n.js +public/javascripts/translations.js + +/config/development_toolbar.rb +/coverage/* +/log/* +/node_modules/* +/public/assets/* +/public/packs-test/* +/public/packs/* +/public/uploads/* +/spec/fixtures/target_* +/tmp/* +/vendor/bundle/* diff --git a/Dockerfile.build b/Dockerfile.build new file mode 100644 index 000000000..d15b3424c --- /dev/null +++ b/Dockerfile.build @@ -0,0 +1,37 @@ +FROM debian:stable-slim + +ENV RAILS_ENV test +ENV KEEP_DATABASE_CONFIG true +ENV IGNORE_YARN_INSTALL true + +# Prepare nodejs 6.x and yarn package installation +RUN apt-get update && apt-get install -y --no-install-recommends curl gnupg ca-certificates apt-transport-https && \ + curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ + echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list && \ + curl -sS https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \ + echo "deb https://deb.nodesource.com/node_6.x stretch main" > /etc/apt/sources.list.d/nodesource.list + +# Install ruby, native dependencies, bundler and yarn +RUN apt-get update && mkdir -p /usr/share/man/man1 /usr/share/man/man7 && \ + apt-get install -y --no-install-recommends ruby2.3 && \ + apt-get install -y --no-install-recommends libpq5 libxml2 zlib1g imagemagick libproj12 postgresql-client-common postgresql-client-9.6 yarn nodejs && \ + gem2.3 install --no-ri --no-rdoc bundler + +# Install bundler packages +COPY Gemfile Gemfile.lock /app/ +RUN apt-get -y install --no-install-recommends build-essential ruby2.3-dev libpq-dev libxml2-dev zlib1g-dev libproj-dev libmagic1 libmagic-dev git-core&& \ + cd /app && bundle install --deployment + +# Install yarn packages +COPY package.json yarn.lock /app/ +RUN cd /app && yarn --frozen-lockfile install + +# Install application file +COPY . /app/ + +# Override database.yml and secrets.yml files +COPY config/database.yml.docker app/config/database.yml +COPY config/secrets.yml.docker app/config/secrets.yml + +WORKDIR /app +CMD ["sh", "-c", "bundle exec rake ci:docker"] diff --git a/config/database.yml.docker b/config/database.yml.docker index f49b22b87..29d198604 100644 --- a/config/database.yml.docker +++ b/config/database.yml.docker @@ -6,6 +6,6 @@ port: <%= ENV.fetch 'RAILS_DB_PORT', '5432' %> schema_search_path: 'public,shared_extensions' postgis_schema: 'shared_extensions' - database: <%= ENV.fetch 'RAILS_DB_NAME', 'chouette' %> + database: <%= ENV.fetch 'RAILS_DB_NAME', 'chouette' %><%= ENV['TEST_ENV_NUMBER'] %> username: <%= ENV.fetch 'RAILS_DB_USER', 'chouette' %> password: <%= ENV.fetch 'RAILS_DB_PASSWORD' %> diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake index 0723e4ccb..7ef867b71 100644 --- a/lib/tasks/ci.rake +++ b/lib/tasks/ci.rake @@ -14,10 +14,19 @@ namespace :ci do desc "Prepare CI build" task :setup do - cp "config/database.yml", "config/database.yml.orig" - cp "config/database/ci.yml", "config/database.yml" - puts "Use #{database_name} database" + unless ENV["IGNORE_YARN_INSTALL"] + # FIXME remove this specific behavior + # Managed by Dockerfile.build + sh "yarn --frozen-lockfile install" + end + + unless ENV["KEEP_DATABASE_CONFIG"] + # FIXME remove this specific behavior + cp "config/database.yml", "config/database.yml.orig" + cp "config/database/ci.yml", "config/database.yml" + end + puts "Use #{database_name} database" if parallel_tests? sh "RAILS_ENV=test rake parallel:drop parallel:create parallel:migrate" else @@ -25,6 +34,15 @@ namespace :ci do end end + task :fix_webpacker do + # Redefine webpacker:yarn_install to avoid --production + # in CI process + Rake::Task["webpacker:yarn_install"].clear + Rake::Task.define_task "webpacker:yarn_install" do + puts "Don't run yarn" + end + end + def git_branch if ENV['GIT_BRANCH'] =~ %r{/(.*)$} $1 @@ -52,7 +70,7 @@ namespace :ci do end task :assets do - sh "RAILS_ENV=test bundle exec rake assets:precompile i18n:js:export" + sh "RAILS_ENV=test bundle exec rake ci:fix_webpacker assets:precompile i18n:js:export" end task :jest do |