mirror of
https://github.com/khoj-ai/khoj.git
synced 2024-11-23 15:38:55 +01:00
Switch node/yarn install steps to use more native installation patterns
This commit is contained in:
parent
6d5ca5a3e1
commit
1af9dbb083
2 changed files with 16 additions and 16 deletions
18
Dockerfile
18
Dockerfile
|
@ -1,18 +1,18 @@
|
||||||
# syntax=docker/dockerfile:1
|
# syntax=docker/dockerfile:1
|
||||||
FROM ubuntu:jammy
|
FROM ubuntu:jammy
|
||||||
LABEL "homepage" "https://khoj.dev"
|
LABEL homepage="https://khoj.dev"
|
||||||
LABEL "repository" "https://github.com/khoj-ai/khoj"
|
LABEL repository="https://github.com/khoj-ai/khoj"
|
||||||
LABEL "org.opencontainers.image.source" "https://github.com/khoj-ai/khoj"
|
LABEL org.opencontainers.image.source="https://github.com/khoj-ai/khoj"
|
||||||
|
|
||||||
# Install System Dependencies
|
# Install System Dependencies
|
||||||
RUN apt update -y && apt -y install python3-pip swig curl
|
RUN apt update -y && apt -y install python3-pip swig curl
|
||||||
|
|
||||||
# Install Node.js and Yarn
|
# Install Node.js and Yarn using nvm in a single RUN instruction
|
||||||
RUN curl -sL https://deb.nodesource.com/setup_22.x | bash -
|
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash - && \
|
||||||
RUN apt -y install nodejs
|
export NVM_DIR="$HOME/.nvm" && \
|
||||||
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
|
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
|
||||||
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
|
nvm install 20 && \
|
||||||
RUN apt update && apt -y install yarn
|
npm install --global yarn
|
||||||
|
|
||||||
# Install RapidOCR dependencies
|
# Install RapidOCR dependencies
|
||||||
RUN apt -y install libgl1 libgl1-mesa-glx libglib2.0-0
|
RUN apt -y install libgl1 libgl1-mesa-glx libglib2.0-0
|
||||||
|
|
|
@ -1,16 +1,16 @@
|
||||||
FROM ubuntu:jammy
|
FROM ubuntu:jammy
|
||||||
|
|
||||||
LABEL org.opencontainers.image.source https://github.com/khoj-ai/khoj
|
LABEL org.opencontainers.image.source="https://github.com/khoj-ai/khoj"
|
||||||
|
|
||||||
# Install System Dependencies
|
# Install System Dependencies
|
||||||
RUN apt update -y && apt -y install python3-pip libsqlite3-0 ffmpeg libsm6 libxext6 swig curl
|
RUN apt update -y && apt -y install python3-pip libsqlite3-0 ffmpeg libsm6 libxext6 swig curl
|
||||||
|
|
||||||
# Install Node.js and Yarn
|
# Install Node.js and Yarn using nvm in a single RUN instruction
|
||||||
RUN curl -sL https://deb.nodesource.com/setup_22.x | bash -
|
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash - && \
|
||||||
RUN apt -y install nodejs
|
export NVM_DIR="$HOME/.nvm" && \
|
||||||
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
|
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
|
||||||
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
|
nvm install 20 && \
|
||||||
RUN apt update && apt -y install yarn
|
npm install --global yarn
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue