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
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.
  • Loading branch information
Splines committed May 31, 2024
1 parent 0b064ac commit b3f3ec8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 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,6 @@ 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 ./docker/production/docker.env ./docker-dummy.env

RUN set -o allexport && . ./docker-dummy.env && set +o allexport && \
Expand Down
11 changes: 4 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,10 @@ services:
SPROCKETS_CACHE: /cache
BLOG: https://mampf.blog
volumes:
- type: bind
source: ../../spec/
target: /usr/src/app/spec/
- ../../coverage:/usr/src/app/coverage
- type: bind
source: ../../
target: /usr/src/app/
- ../../coverage:/usr/src/app/coverage
depends_on:
- db
- solr
Expand Down

0 comments on commit b3f3ec8

Please sign in to comment.