diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile index 203e99a..65e4759 100644 --- a/docker/app/Dockerfile +++ b/docker/app/Dockerfile @@ -2,7 +2,7 @@ FROM node:latest AS builder ADD https://git.tanshu.com/api/v1/repos/tanshu/barker/tags /tags.json RUN git clone --single-branch --depth 1 --branch latest https://git.tanshu.com/tanshu/barker.git /app WORKDIR /app/bookie -RUN npm install --unsafe-perm --legacy-peer-deps && /app/bookie/node_modules/.bin/ng build --prod +RUN npm install --unsafe-perm && /app/bookie/node_modules/.bin/ng build --prod FROM python:latest diff --git a/docker/app/worker.Dockerfile b/docker/app/worker.Dockerfile index 7b7b2cf..f26d6d2 100644 --- a/docker/app/worker.Dockerfile +++ b/docker/app/worker.Dockerfile @@ -1,21 +1,5 @@ -FROM python:latest +FROM barker:latest LABEL maintainer="Amritanshu " -RUN git clone --single-branch --depth 1 --branch latest https://git.tanshu.com/tanshu/barker.git /repo -RUN mkdir /app && mv /repo/barker/* /app -WORKDIR /app - -# Install Poetry -RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | POETRY_HOME=/opt/poetry python && \ - cd /usr/local/bin && \ - ln -s /opt/poetry/bin/poetry && \ - poetry config virtualenvs.create false - -# Allow installing dev dependencies to run tests -ARG INSTALL_DEV=false -RUN bash -c "if [ $INSTALL_DEV == 'true' ] ; then poetry install --no-root ; else poetry install --no-root --no-dev ; fi" - -ENV C_FORCE_ROOT=1 -ENV PYTHONPATH=/app RUN chmod 777 /app/worker-start.sh \ && ln -s /app/worker-start.sh /usr/local/bin/worker-start.sh \