Merge pull request #103 from chamathpali/master

fix: docker and dependency updates
RGU-Computing · May 26, 2024 · a1a7e43 · a1a7e43
2 parents d4cf78a + 317c9f3
commit a1a7e43
Show file tree

Hide file tree

Showing 9 changed files with 11,446 additions and 6,031 deletions.
diff --git a/api/Dockerfile b/api/Dockerfile
@@ -3,12 +3,12 @@ FROM python:3.7-buster
 WORKDIR /app
 
 RUN \
-  echo "deb https://deb.nodesource.com/node_16.x buster main" > /etc/apt/sources.list.d/nodesource.list && \
+  echo "deb https://deb.nodesource.com/node_18.x buster main" > /etc/apt/sources.list.d/nodesource.list && \
   wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
   apt-get update && \
   apt-get install -yqq nodejs yarn && \
   pip install -U pip && pip install pipenv && \
-  npm i -g npm@^8
+  npm i -g npm
 
 RUN pip install --no-cache --upgrade pip setuptools
 
@@ -18,7 +18,7 @@ COPY . /app
 RUN pip install --no-cache-dir -r requirements.txt
 
 RUN npm ci
-RUN npm install serverless
+RUN npm install serverless@3.11.0 --legacy-peer-deps
 RUN npm i -g nodemon
 RUN npm install serverless-python-requirements
 

diff --git a/api/package-lock.json b/api/package-lock.json
diff --git a/api/package.json b/api/package.json
@@ -9,7 +9,7 @@
     "core-util-is": "^1.0.2"
   },
   "devDependencies": {
-    "serverless-offline": "^8.5.0",
+    "serverless-offline": "^13.6.0",
     "serverless-python-requirements": "^5.4.0",
     "serverless-wsgi": "^1.7.4"
   }

diff --git a/other-services/angle-semantic-sim/Dockerfile b/other-services/angle-semantic-sim/Dockerfile
@@ -1,5 +1,6 @@
 FROM python:3.10.12
 WORKDIR /app
 COPY . /app
-RUN pip install --no-cache-dir --upgrade -r /app/requirements.txt
+RUN pip install --upgrade pip
+RUN pip install --no-cache-dir --upgrade --default-timeout=100 -r /app/requirements.txt
 CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "80"]
diff --git a/other-services/ontology-sim/Dockerfile b/other-services/ontology-sim/Dockerfile
@@ -10,15 +10,15 @@ RUN \
   pip install -U pip && pip install pipenv && \
   npm i -g npm@^8
 
-RUN pip install --no-cache --upgrade pip setuptools
+RUN pip install --no-cache --upgrade --default-timeout=100 pip setuptools
 
 # Serverless part
 COPY . /app
 
 RUN pip install --no-cache-dir -r requirements.txt
 
 RUN npm install
-RUN npm install serverless
+RUN npm install serverless@3.11.0 --legacy-peer-deps
 RUN npm i -g nodemon
 RUN npm install serverless-python-requirements
 

diff --git a/other-services/semantic-sim/Dockerfile b/other-services/semantic-sim/Dockerfile
@@ -1,5 +1,6 @@
-FROM python:3.9
+FROM python:3.10.12
 WORKDIR /app
 COPY . /app
-RUN pip install --no-cache-dir --upgrade -r /app/requirements.txt
+RUN pip install --upgrade pip
+RUN pip install --no-cache-dir --default-timeout=100 --upgrade -r /app/requirements.txt
 CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "80"]
diff --git a/other-services/use-vector/Dockerfile b/other-services/use-vector/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:17-alpine as build
+FROM node:20-alpine as build
 
 WORKDIR /app
 ENV PATH /app/node_modules/.bin:$PATH
@@ -8,10 +8,13 @@ COPY serverless.yml /app
 COPY package.json /app
 COPY package-lock.json /app
 COPY . /app
-RUN npm ci
-RUN npm install serverless
+RUN npm config set fetch-timeout 60000
+RUN npm config set fetch-retries 5
+RUN npm config set fetch-retry-factor 10
+RUN npm ci  --legacy-peer-deps
+RUN npm install serverless@3.11.0 --legacy-peer-deps
 
 
 EXPOSE 4100
 
-CMD ["node", "./node_modules/serverless/bin/serverless.js", "offline", "start",  "--host", "0.0.0.0"]
+CMD ["npx", "serverless", "offline", "start", "--host", "0.0.0.0"]