diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7b5ded7..0c31b4e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,23 +19,8 @@ test: - source scripts/dev-setup script: - make opencv -j$(nproc --ignore=2) - - make -C alg qrtool -j$(nproc --ignore=2) - make test -build-alg: - stage: test-and-build - except: - - main - tags: - - derby - script: - - make opencv -j$(nproc --ignore=2) - - make build/alg/qrtool -j$(nproc --ignore=2) - artifacts: - paths: - - build - - alg/qrtool - build-web: stage: test-and-build except: @@ -61,7 +46,6 @@ build-docker: - make docker-push dependencies: - build-web - - build-alg except: - main diff --git a/Dockerfile b/Dockerfile index ba7cd1c..803e390 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,6 @@ RUN apt-get update -y && DEBIAN_FRONTEND=noninteractive apt-get install -y $(cat RUN pip3 install --no-cache-dir torch==1.13.0 torchvision==0.14.0 torchaudio==0.13.0 ADD requirements.txt requirements.txt RUN pip3 install --no-cache-dir -r requirements.txt -ADD alg /emblem/alg ADD api /emblem/api ADD web /emblem/web RUN cd /emblem/api && ./manage.py collectstatic --noinput