Skip to content

Commit

Permalink
Don't just mount spec folder, but complete app folder for tests (#…
Browse files Browse the repository at this point in the history
…648)

* Don't just mount `spec` folder, but complete `app` folder for tests

This is to ensure that local changes in the `app` folder are reflected
in the Docker container such that newly written tests can be run through
without having to rebuild the whole Docker image.

* Exclude `public/` folder from mount

Also see: https://stackoverflow.com/a/56361190/

* Copy everything to `usr/src/app` for precompiling to work & fix `public/` folder mount

Also see https://stackoverflow.com/a/37898591/
  • Loading branch information
Splines authored Jun 1, 2024
1 parent 4ead9d5 commit 0c841de
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
3 changes: 2 additions & 1 deletion docker/test/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ RUN apt update && \
RUN sed -i '/disable ghostscript format types/,+6d' /etc/ImageMagick-6/policy.xml

WORKDIR /usr/src/app
ENTRYPOINT ["./entrypoint.sh"]

COPY ./Gemfile ./Gemfile.lock ./yarn.lock ./package.json /usr/src/app/
RUN bundle install
Expand All @@ -66,7 +67,7 @@ RUN yarn install --production=false
COPY --from=build-pdfcomprezzor /go/src/pdfcomprezzor.wasm /go/src/wasm_exec.js /usr/src/app/public/pdfcomprezzor/
COPY --from=build-pdfcomprezzor /go/src/pdfcomprezzor.wasm /go/src/wasm_exec.js /

COPY . /usr/src/app/
COPY . /usr/src/app
COPY ./docker/production/docker.env ./docker-dummy.env

RUN set -o allexport && . ./docker-dummy.env && set +o allexport && \
Expand Down
10 changes: 3 additions & 7 deletions docker/test/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ services:
context: ./../..
dockerfile: docker/test/Dockerfile
image: mampf:tests
# TODO: Use this
# entrypoint: /usr/src/app/docker/test/run_tests.sh
entrypoint: /usr/src/app/entrypoint.sh
environment:
RAILS_ENV: test
TEST_DATABASE_ADAPTER: postgresql
Expand Down Expand Up @@ -68,10 +65,9 @@ services:
SPROCKETS_CACHE: /cache
BLOG: https://mampf.blog
volumes:
- type: bind
source: ../../spec/
target: /usr/src/app/spec/
- ../../coverage:/usr/src/app/coverage
- ../../:/usr/src/app/
- ../../coverage:/usr/src/app/coverage/
- "/usr/src/app/public/"
depends_on:
- db
- solr
Expand Down

0 comments on commit 0c841de

Please sign in to comment.