Skip to content

Commit

Permalink
infra: bump ubuntu 20.04 -> 24.04
Browse files Browse the repository at this point in the history
  • Loading branch information
vas3k committed Jan 18, 2025
1 parent 9489297 commit 7a6461a
Show file tree
Hide file tree
Showing 5 changed files with 1,051 additions and 800 deletions.
17 changes: 11 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM ubuntu:20.04
FROM ubuntu:24.04
ENV MODE dev
ENV DEBIAN_FRONTEND=noninteractive
ENV PIP_BREAK_SYSTEM_PACKAGES=1

RUN apt-get update \
&& apt-get install --no-install-recommends -yq \
Expand All @@ -22,9 +23,13 @@ COPY . /app
COPY etc/crontab /etc/crontab
RUN chmod 600 /etc/crontab

RUN cd frontend && npm install && npm run build && cd ..
RUN cd frontend && npm ci && npm run build && cd ..

RUN pip3 install pipenv==2021.5.29
RUN sh -c 'if [ "$MODE" = 'production' ]; then pipenv lock --keep-outdated --requirements > requirements.txt; fi'
RUN sh -c 'if [ "$MODE" = 'dev' ]; then pipenv lock --dev --requirements > requirements.txt; fi'
RUN pip3 install -r requirements.txt
RUN pip3 install pipenv
RUN if [ "$MODE" = "production" ]; then \
pipenv requirements --keep-outdated > requirements.txt; \
elif [ "$MODE" = "dev" ]; then \
pipenv requirements --dev > requirements.txt; \
fi

RUN pip3 install --ignore-installed -r requirements.txt
26 changes: 14 additions & 12 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,37 @@ pytest = "*"
django-debug-toolbar = "*"

[packages]
django = "==3.2.13"
django-webpack-loader = "1.4.1"
requests = ">=2.28.2"
django = "==4.2.18"
django-webpack-loader = "==3.1.1"
requests = "==2.32.3"
pyjwt = "==2.6.0"
cryptography = ">=39.0.2"
patreon = ">=0.5"
sentry-sdk = ">=1.16.0"
sentry-sdk = "==2.20.0"
psycopg2-binary = "==2.9.7"
awesome-slugify = ">=1.6.5"
mistune = "==2.0.0a4"
click = "*"
pillow = ">=9.0.1"
django-simple-history = ">=2.8.0"
python-telegram-bot = "==12.5.1"
django-q = {version = ">=1.3.5", extras = ["sentry"]}
redis = ">=3.4.1"
django-simple-history = "==3.7.0"
python-telegram-bot = "==13.15"
django-q2 = {extras = ["sentry"], version = "==1.7.6"}
redis = "==5.2.1"
python-dotenv = ">=0.12"
newspaper3k = ">=0.2.8"
django-redis = "==4.11.0"
newspaper4k = "==0.9.3.1"
django-redis = "==5.4.0"
gunicorn = "==20.0.4"
uvicorn = "*"
uvloop = "*"
premailer = "==3.6.1"
typus = "*"
stripe = "==2.55.0"
stripe = "==11.4.1"
icalendar = "*"
httptools = "*"
croniter = "*"
authlib = "==1.2"
urllib3 = "<2.0.0" # dirty hack, required for python-telegram-bot<20.0
lxml = {extras = ["html_clean"], version = "==5.3.0"}

[requires]
python_version = "3.8"
python_version = "3.12"
Loading

0 comments on commit 7a6461a

Please sign in to comment.