From 992197c703217f82b865ad0131cabf3ac73d3f78 Mon Sep 17 00:00:00 2001 From: Diego Steiner Date: Fri, 5 Jan 2024 12:33:02 +0100 Subject: [PATCH] fix: ci --- .github/workflows/ci.yml | 3 --- Dockerfile | 10 ++++++++++ docker-compose.ci.yml | 5 +---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 37f777347..8e18772a7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,9 +55,6 @@ jobs: - name: migrate run: docker-compose --file docker-compose.ci.yml run e2e_target bin/rails db:drop db:create db:migrate - - name: bundle - run: docker-compose --file docker-compose.ci.yml run e2e_test bundle install - - name: bin/check run: docker-compose --file docker-compose.ci.yml run e2e_test bin/check diff --git a/Dockerfile b/Dockerfile index 3b534b94e..3e9332fb7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,6 +27,16 @@ USER rails:rails RUN gem install standardrb ruby-lsp +### === test === ### +FROM base AS test + +RUN bundle install && \ + bundle exec bootsnap precompile --gemfile + +COPY . . + +RUN bundle exec bootsnap precompile app/ lib/ + ### === build === ### FROM base AS build diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index dbfa46534..750c0f3c4 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -3,11 +3,8 @@ services: e2e_test: build: context: . - target: development + target: test image: ghcr.io/diegosteiner/heimv-test - volumes: - - .:/rails - - bundle:/usr/local/bundle environment: APP_HOST: "e2e_test" E2E_TARGET_HOST: "e2e_target:3002"