Skip to content

Commit

Permalink
Use requirements.txt for automated version bumps. (#566)
Browse files Browse the repository at this point in the history
* Use requirements.txt for automated version bumps.

Move the Mailman requirements into requirements.txt file so that
we can use dependabot for automated version bumping.

* Remove constraint on mistune

* Add requirements file to dockerfile

* Add dependency on tzdata
  • Loading branch information
maxking authored Oct 26, 2022
1 parent 9686039 commit 9fcf93a
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 9 deletions.
14 changes: 11 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,23 @@ updates:
- package-ecosystem: "docker" # See documentation for possible values
directory: "/web" # Location of package manifests
schedule:
interval: "weekly"
interval: "weekly"
- package-ecosystem: "docker" # See documentation for possible values
directory: "/postorius" # Location of package manifests
schedule:
interval: "weekly"
interval: "weekly"
# Enable version updates for Actions
- package-ecosystem: "github-actions"
# Look for `.github/workflows` in the `root` directory
directory: "/"
# Check for updates once a week
schedule:
interval: "weekly"
interval: "weekly"
- package-ecosystem: "pip"
directory: "/core"
schedule:
interval: "daily"
- package-ecosystem: "pip"
directory: "/web"
schedule:
interval: "daily"
6 changes: 4 additions & 2 deletions core/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ FROM alpine:3.16.2
#Add startup script to container
COPY docker-entrypoint.sh /usr/local/bin/

# Add requirements file.
COPY requirements.txt /tmp/

#Install all required packages, add user for executing mailman and set execution rights for startup script
RUN --mount=type=cache,target=/root/.cache \
apk update \
Expand All @@ -15,10 +18,9 @@ RUN --mount=type=cache,target=/root/.cache \
&& python3 -m pip install -U pip setuptools wheel \
&& python3 -m pip install psycopg2 \
gunicorn==19.9.0 \
mailman==3.3.6 \
mailman-hyperkitty==1.2.0 \
pymysql \
'sqlalchemy<1.4.0' \
-r /tmp/requirements.txt \
&& apk del build-deps \
&& adduser -S mailman

Expand Down
5 changes: 5 additions & 0 deletions core/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# This is a separate file from Dockerfile so that we can use dependabot
# for version updates that isn't supported for contents inside the
# Dockerfile.
mailman==3.3.4
mailman-hyperkitty==1.1.0
7 changes: 3 additions & 4 deletions web/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ FROM alpine:3.16.2
COPY mailman-web /opt/mailman-web
# Add startup script to container
COPY docker-entrypoint.sh /usr/local/bin/
# Add requirements file.
COPY requirements.txt /tmp/

# Install packages and dependencies for postorius and hyperkitty Add user for
# executing apps, change ownership for uwsgi+django files and set execution
Expand All @@ -17,10 +19,7 @@ RUN --mount=type=cache,target=/root/.cache \
postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \
python3 py3-pip xapian-core xapian-bindings-python3 libffi pcre-dev py-cryptography \
&& python3 -m pip install -U 'Django<4.2' pip setuptools wheel \
&& pip install mailmanclient==3.3.4 \
postorius==1.3.7 \
hyperkitty==1.3.6 \
django-mailman3==1.3.8 \
&& pip install -r /tmp/requirements.txt \
whoosh \
uwsgi \
'psycopg2<2.9' \
Expand Down
4 changes: 4 additions & 0 deletions web/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
mailmanclient==3.3.4
postorius==1.3.7
hyperkitty==1.3.6
django-mailman3==1.3.8

0 comments on commit 9fcf93a

Please sign in to comment.