1
0
mirror of https://github.com/krateng/maloja.git synced 2023-08-10 21:12:55 +03:00

Made Dockerfile installations one layer again

This commit is contained in:
krateng 2021-12-23 08:20:31 +01:00
parent 8661d9f7e4
commit 0f40ebbad9
2 changed files with 22 additions and 26 deletions

View File

@ -10,19 +10,17 @@ WORKDIR /usr/src/app
# Copy project into dir # Copy project into dir
COPY . . COPY . .
# Build dependencies RUN \
RUN sh ./install/alpine_requirements_build_volatile.sh # Build dependencies
sh ./install/alpine_requirements_build_volatile.sh && \
# Runtime dependencies # Runtime dependencies
RUN sh ./install/alpine_requirements_run.sh sh ./install/alpine_requirements_run.sh && \
# Python dependencies
# Python dependencies pip3 install --no-cache-dir -r requirements.txt && \
RUN pip3 install --no-cache-dir -r requirements.txt # Local project install
pip3 install /usr/src/app && \
# Local project install # Remove build dependencies
RUN pip3 install /usr/src/app apk del .build-deps
RUN apk del .build-deps
# expected behavior for a default setup is for maloja to "just work" # expected behavior for a default setup is for maloja to "just work"
ENV MALOJA_SKIP_SETUP=yes ENV MALOJA_SKIP_SETUP=yes

View File

@ -10,19 +10,17 @@ WORKDIR /usr/src/app
# Build dependencies RUN \
RUN sh ./install/alpine_requirements_build_volatile.sh # Build dependencies
sh ./install/alpine_requirements_build_volatile.sh && \
# Runtime dependencies # Runtime dependencies
RUN sh ./install/alpine_requirements_run.sh sh ./install/alpine_requirements_run.sh && \
# Python dependencies
# Python dependencies pip3 install --no-cache-dir -r requirements.txt && \
RUN pip3 install --no-cache-dir -r requirements.txt # PyPI install
pip3 install malojaserver==$MALOJA_RELEASE && \
# Local project install # Remove build dependencies
RUN pip3 install malojaserver==$MALOJA_RELEASE apk del .build-deps
RUN apk del .build-deps
# expected behavior for a default setup is for maloja to "just work" # expected behavior for a default setup is for maloja to "just work"
ENV MALOJA_SKIP_SETUP=yes ENV MALOJA_SKIP_SETUP=yes