Merge branch 'dev' into feature/user-cleaner

docker/test/Dockerfile

@@ -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
@@ -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 && \

docker/test/docker-compose.yml

@@ -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
@@ -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