Skip to content

Commit

Permalink
Updated requirements and dockerfile
Browse files Browse the repository at this point in the history
Updated requirements and dockerfile
  • Loading branch information
wickedyoda committed Aug 15, 2024
1 parent 574b495 commit a200a74
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 57 deletions.
33 changes: 19 additions & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Build Vue.js frontend
FROM node:20-alpine as build-stage

ARG VUE_APP_VERSION
ENV VUE_APP_VERSION=${VUE_APP_VERSION}

WORKDIR /app
COPY ./frontend/package*.json ./
RUN npm install --verbose
COPY ./frontend/ ./
RUN npm run build --verbose

# Setup Container and install Flask backend
FROM python:3.8-alpine as deploy-stage
FROM python:3.11-alpine as deploy-stage

# Set environment variables
ENV PYTHONIOENCODING=UTF-8
Expand All @@ -22,25 +34,18 @@ RUN apk add --no-cache \
jpeg-dev \
zlib-dev \
yaml-dev \
python3-dev
python3-dev \
ruby-dev \
nginx

# Upgrade pip, setuptools, and wheel
RUN pip3 install --upgrade pip setuptools wheel

# Install Cython explicitly to avoid issues with PyYAML
RUN pip3 install Cython --verbose

# Attempt to install PyYAML
RUN pip3 install --no-cache-dir --force-reinstall PyYAML==5.4.1 --verbose

# Install aiostream separately to troubleshoot installation issues
RUN pip3 install --use-pep517 aiostream==0.4.3 --no-cache-dir --verbose

# Install all remaining Python modules from requirements.txt
RUN pip3 install --use-pep517 -r requirements.txt --no-cache-dir --verbose
# Install Python packages from requirements.txt
RUN pip3 install -r requirements.txt --no-cache-dir --verbose

# Install SASS via gem
RUN apk add --no-cache ruby-dev && gem install sass --verbose
RUN gem install sass --verbose

# Clean up build dependencies
RUN apk del --purge build-base && \
Expand Down
86 changes: 43 additions & 43 deletions backend/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
aiodocker==0.19.1
aiosqlite==0.15.0
aiostream==0.4.3
alembic==1.4.3
bcrypt==3.1.7
aiodocker==0.21.0
aiosqlite==0.19.0
aiostream==0.4.4
alembic==1.10.4
bcrypt==4.0.1
certifi==2023.7.22
cffi==1.14.1
chardet==3.0.4
click==7.1.2
databases==0.3.2
dnspython==2.0.0
docker==4.4.4
docker-compose==1.28.4
email-validator==1.1.1
fastapi==0.63.0
fastapi-jwt-auth==0.5.0
gunicorn==20.0.4
h11==0.9.0
httptools==0.1.1
idna==2.10
python-jose==3.2.0
makefun==1.9.2
mysqlclient==2.0.3
passlib==1.7.4
psycopg2-binary==2.8.6
pycparser==2.20
pydantic==1.7.3
PyJWT==1.7.1
python-multipart==0.0.5

requests==2.24.0
six==1.15.0
sh==1.14.1
SQLAlchemy==1.3.19
starlette==0.13.6
sse-starlette==0.6.2
typing-extensions==3.7.4.2
urllib3==1.26.18
uvicorn==0.11.8
uvloop==0.14.0
websocket-client==0.57.0
websockets==8.1
wheel==0.38.0
setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability
cffi==1.15.1
chardet==4.0.0
click==8.1.6
databases==0.6.2
dnspython==2.3.0
docker==6.1.2
docker-compose==2.20.0
email-validator==1.3.1
fastapi==0.103.1
fastapi-jwt-auth==0.6.1
gunicorn==20.1.0
h11==0.14.0
httptools==0.5.0
idna==3.4
python-jose==3.3.0
makefun==1.15.0
mysqlclient==2.2.0
passlib==1.8.1
psycopg2-binary==2.9.7
pycparser==2.21
pydantic==2.0.2
PyJWT==2.7.0
python-multipart==0.0.6
PyYAML==6.0.1
requests==2.31.0
six==1.16.0
sh==1.14.3
SQLAlchemy==2.0.20
starlette==0.27.0
sse-starlette==1.4.1
typing-extensions==4.7.1
urllib3==2.0.4
uvicorn==0.22.0
uvloop==0.17.0
websocket-client==1.7.2
websockets==11.0.2
wheel==0.41.0
setuptools==68.0.0

0 comments on commit a200a74

Please sign in to comment.