I2P_Developers/i2p.www
3
0
Fork 5
Code Issues 27 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update hashes, blog, version

Browse Source
This commit is contained in:
eyedeekay
2025-03-30 18:46:52 -04:00
parent 66f70f91bf
commit e7562db9bc
4 changed files with 60 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
Dockerfile
View File

@ -1,41 +1,64 @@
FROM debian:oldoldstable as builder
ENV SERVERNAME=geti2p.net \
SERVERMAIL=example@geti2p.net
# Install only build dependencies first
RUN apt-get update && \
apt-get install -y --no-install-recommends \
python2-dev \
python-pip \
patch \
python-virtualenv \
git \
python-polib && \
rm -rf /var/lib/apt/lists/*
WORKDIR /build
# Copy dependency files first for better layer caching
COPY etc/reqs.txt etc/
COPY etc/multi-domain.patch etc/
# Setup virtual environment and install dependencies
RUN virtualenv --distribute env && \
. env/bin/activate && \
pip install -r etc/reqs.txt
# Now copy the rest of the application
COPY . .
# Build steps in a single layer
RUN . env/bin/activate && \
patch -p0 -N -r - < etc/multi-domain.patch && \
./compile-messages.sh && \
echo "Git revision: $(git log -n 1 | grep commit | sed 's/commit //' | sed 's/ .*$//')" > ./i2p2www/pages/include/mtnversion
# Start second stage with same old base image
FROM debian:oldoldstable
ENV SERVERNAME=geti2p.net
ENV SERVERMAIL=example@geti2p.net
# Install only runtime dependencies
RUN apt-get update && \
apt-get install -y --no-install-recommends \
apache2 \
apache2-utils \
libapache2-mod-wsgi \
python2-minimal && \
rm -rf /var/lib/apt/lists/*
WORKDIR /var/www/i2p.www
## Install the dependencies
#RUN #grep -v security.debian /etc/apt/sources.list > /etc/apt/sources.list.bak && \
#grep -v stretch-updates /etc/apt/sources.list.bak > /etc/apt/sources.list && \
RUN apt-get update && \
apt-get -y install apache2 apache2-utils libapache2-mod-wsgi python2-dev python-pip patch python-virtualenv git python-polib
# Copy built artifacts
COPY --from=builder /build /var/www/i2p.www
COPY --from=builder /build/env /var/www/env
ADD . /var/www/i2p.www
## Start setting up the site
RUN rm -rfv env && \
virtualenv --distribute env && \
. env/bin/activate && \
pip install -r etc/reqs.txt && \
patch -p0 -N -r - <etc/multi-domain.patch && \
cp -rv env ../env && \
./compile-messages.sh && \
echo "Git revision: $(git log -n 1 | grep commit | sed 's/commit //' | sed 's/ .*$//')" | tee ./i2p2www/pages/include/mtnversion && \
## We've now updated the site
## Next let's configure WSGI
## Set ownership of site to server
cp etc/docker.wsgi.i2p i2p.wsgi && \
chown -R www-data /var/www/i2p.www && \
## Make the WSGI script owned by the server
chown www-data:www-data /var/www/i2p.www/i2p.wsgi && \
## Make the WSGI script executable
chmod 755 /var/www/i2p.www/i2p.wsgi && \
## Copy the unmodified vhosts file to the apache2 confdir
cp etc/apache2.i2p.conf /etc/apache2/sites-available/i2p.conf && \
a2enmod wsgi && \
# Configure Apache and WSGI in a single layer
RUN cp etc/docker.wsgi.i2p i2p.wsgi && \
chown -R www-data:www-data /var/www/i2p.www && \
chmod 755 i2p.wsgi && \
cp etc/apache2.i2p.conf /etc/apache2/sites-available/i2p.conf && \
a2enmod wsgi && \
a2ensite i2p && \
ls /etc/apache2 && \
sed -i 's|IncludeOptional sites-enabled|# IncludeOptional sites-enabled|g' /etc/apache2/apache2.conf && \
sed -i '1 i\IncludeOptional sites-enabled/i2p.conf' /etc/apache2/apache2.conf
CMD service apache2 restart && tail -f /var/log/apache2/access.log /var/log/apache2/error.log
CMD service apache2 restart && tail -f /var/log/apache2/access.log /var/log/apache2/error.log

2
i2p2www/__init__.py
View File

@ -22,7 +22,7 @@ except ImportError:
###########
# Constants
CURRENT_I2P_VERSION = '2.8.1'
CURRENT_I2P_VERSION = '2.8.2'
CURRENT_I2P_FIREFOX_PROFILE_VERSION = '2.8.0'
CURRENT_I2P_OSX_VERSION = '1.9.0'

0
i2p2www/blog/2025/03/29/2.8.2-Release.draft.rst → i2p2www/blog/2025/03/29/2.8.2-Release.rst
View File

8
i2p2www/pages/downloads/macros
View File

@ -1,7 +1,7 @@
{% set i2pinstall_windows_hash = '013f30db4116711fdb5f78f21f55da9a883a7de110f9c5b6d4f1390d60cc3441' %}
{% set i2pinstall_jar_hash = 'a2f590156b6c58574c54860afb196886bc23e609ec26c3797ad0ef27289727f3' %}
{% set i2psource_hash = '6af1b88404527d9f5f88a29434979e048ac9d6fdc6ad7f5edbd0b318a1a1e57d' %}
{% set i2pupdate_hash = 'c89433df991876952fa2e4d7ebf2cb8c705911b80f240e6ddd3d8cba4aabed58' %}
{% set i2pinstall_windows_hash = '7658f9ba7e28ab29ffeb3ec1909bf04f5ae391ee159980145ea01bd793c46f80' %}
{% set i2pinstall_jar_hash = 'cd606827a9bca363bd6b3c89664772ec211d276cce3148f207643cc5e5949b8a' %}
{% set i2psource_hash = '039b59fedd4a64aaeb6b74ab974310abdc9c08cb47ef1b8568c718965b50a485' %}
{% set i2pupdate_hash = '15d886a9015dcf27ccc25e31b703ef6538b8b777176adf643dfe8ee0ba4984e0' %}
{% set i2p_android_hash = '9378b9b50baae300f91f3fcf87ed8579ece2e650f4a83f3f23f7868c443479b8' %}
{% set i2p_macnative_hash = '18cb22cfcc3cbe0cec150e89a394d1a35703cb508ed627ef48084b7ba7c90dde' %}