diff --git a/Dockerfile b/Dockerfile index f18c3ba19d..38c864a036 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,14 @@ FROM ubuntu:focal as base ARG DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Moscow # install dependencies + +RUN apt-get update +RUN apt-get install -y --no-install-recommends sudo ccache tini tzdata + COPY ./scripts /tmp/scripts COPY ./problem-solver/sc-machine/scripts /tmp/problem-solver/sc-machine/scripts COPY ./problem-solver/sc-machine/requirements.txt /tmp/problem-solver/sc-machine/requirements.txt -RUN apt-get update && \ - apt-get install -y --no-install-recommends sudo ccache tini tzdata && \ - /tmp/scripts/install_problem_solver_deps.sh +RUN /tmp/scripts/install_problem_solver_deps.sh FROM base as builder ENV CCACHE_DIR=/ccache diff --git a/docker-compose.yml b/docker-compose.yml index eb8ae077ce..b568aed9c9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -37,7 +37,7 @@ services: expose: - 8090 healthcheck: - test: "python3 /nika/problem-solver/sc-machine/scripts/healthcheck.py" + test: "bash -c 'python3 /nika/problem-solver/sc-machine/scripts/healthcheck.py'" interval: 5s timeout: 10s retries: 6 diff --git a/interface/.gitignore b/interface/.gitignore index 3c3629e647..dd87e2d73f 100644 --- a/interface/.gitignore +++ b/interface/.gitignore @@ -1 +1,2 @@ node_modules +build diff --git a/interface/Dockerfile b/interface/Dockerfile index 5bbfc75fde..08c6559d61 100644 --- a/interface/Dockerfile +++ b/interface/Dockerfile @@ -3,7 +3,7 @@ FROM node:16-alpine AS web-buildenv WORKDIR /nika-ui #Install build-time dependencies -COPY package.json package-lock.json ./ +COPY package.json package-lock.json yarn.lock ./ RUN yarn #Build the interface COPY . .