Merge branch 'master' into 'dev'

Master

See merge request software/services/fair/software-quality-assurance!57

QUALITY.md

@@ -18,9 +18,9 @@
 
 **Software Location:** [gitext](gitext.gfz-potsdam.de/software/services/fair/software-quality-assurance)
 
-**Last Commit:** e8488f32ac05dd6aebf054afdf8b6409ac71d4db
+**Last Commit:** 288f9dfe41a7f66724ce3ee0df19b3df66794355
 
-**Report Time:** 17/10/2020 10:08:20 UTC
+**Report Time:** 17/10/2020 10:18:34 UTC
 
 **Report Version:** 0.6.0
 

build/docker/app/Dockerfile_dev

@@ -36,4 +36,4 @@ WORKDIR /tmp/build/src
 RUN python setup.py install
 
 # cleanup
-RUN rm -r /tmp/build
\ No newline at end of file
+RUN rm -r /tmp/build

build/docker/app/Dockerfile_prod

@@ -26,27 +26,14 @@ FROM gitext.gfz-potsdam.de:5000/software/services/fair/software-quality-assuranc
 
 LABEL maintainer="Maximilian Dolling <mdolling@gfz-potsdam.de>"
 
-# set env vars
-ARG version
-ENV SQA_VERSION $version
-ENV SQA_REPO_DIR /repo
-ENV SQA_CONFIG_DIR $SQA_REPO_DIR/.sqa
-ENV SQA_REPORT_DIR $SQA_REPO_DIR/meta
-ENV SQA_TEST false
-ENV SQA_OUTPUT_FORMAT 'file'
-
 # update system
 RUN apk update
 RUN apk upgrade
 
-# copy entrypoint script to executables
-COPY ./build/docker/app/docker-entrypoint.sh /usr/local/bin/
-RUN ln -s /usr/local/bin/docker-entrypoint.sh /usr/local/bin/sqa
-COPY ./build/docker/app/entrypoint-manual.txt /usr/local/bin/
-
 # copy service scripts to root dir
-COPY ./src/services /services
-COPY ./src/utility /utility
+COPY ./ /tmp/build
+WORKDIR /tmp/build/src
+RUN python setup.py install
 
-ENTRYPOINT ["docker-entrypoint.sh"]
-CMD ["--help"]
+# cleanup
+RUN rm -r /tmp/build