diff --git a/.dockerignore b/.dockerignore index e69de29b..c77df6fe 100644 --- a/.dockerignore +++ b/.dockerignore @@ -0,0 +1,2 @@ +docker-run-dev.sh +site-updater-docker.sh \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 2f15756f..682aab6f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,7 @@ RUN rm -rfv env && \ . env/bin/activate && \ pip install -r etc/reqs.txt && \ patch -p0 -N -r - /dev/null 2>&1 && pwd )" || exit -cd "$DIR" || exit - -git pull origin $i2p_www_branch -docker build $i2p_www_docker_build_args -t mirror.i2p.www$suffix . -docker rm -f mirror.i2p.www$suffix -docker run -it $i2p_www_docker_run_args --env DEV:on --name mirror.i2p.www$suffix --net=host --volume $(pwd)/env:/env mirror.i2p.www$suffix ./runserver.py -docker logs -f mirror.i2p.www$suffix +export devmode="--volume $(pwd):/var/www/i2p.www" +./site-updater-docker.sh runserver.sh \ No newline at end of file diff --git a/etc/project.vars b/etc/project.vars index b8c3ff77..065b17bf 100644 --- a/etc/project.vars +++ b/etc/project.vars @@ -3,5 +3,5 @@ export spec="" export venv="`which virtualenv-2.7`" if [ x"$venv" = x ]; then export venv="`which virtualenv`" - export spec="-p 2.7" + #export spec="-p 2.7" fi diff --git a/i2p2www/blog/2024/07/19/2.6.0-Release.draft.rst b/i2p2www/blog/2024/07/19/2.6.0-Release.draft.rst index d5385d1a..cb11426f 100644 --- a/i2p2www/blog/2024/07/19/2.6.0-Release.draft.rst +++ b/i2p2www/blog/2024/07/19/2.6.0-Release.draft.rst @@ -59,4 +59,9 @@ __ http://{{ i2pconv('git.idk.i2p') }}/i2p-hackers/i2p.i2p/-/issues?scope=all&st :: - sum file + 13f2e6b3cc9716c89c4d4d3bc9918171fbad5f450171e1c32b1237b5421bc065 i2pinstall_2.6.0_windows.exe + 42ac34e4c67cf5e2582853f0cf3074f6a73ea59503e1350e1b687cee3f849814 i2pinstall_2.6.0_windows.exe.sig + 24cda3f04e8c2e976b73bd45d36d0e31217e28fbe3019bf9a9d839b45d60537a i2pinstall_2.6.0.jar + 249b35c1e061e194ee18048b0644cc5e2c5cf785ffce655e3124eb959dc189ff i2psource_2.6.0.tar.bz2 + 2867d752f6fb89a7a5ada4f4123ca601ad8d78ff78f553a9269bf0ddffe724ca i2pupdate_2.6.0.zip + be6ac988497ac0336d21cdfc57bbbe3cc5cffd983ac3282fd8ea11914e18e7ee i2pupdate.su3 diff --git a/i2p2www/pages/downloads/macros b/i2p2www/pages/downloads/macros index f246a483..331e3963 100644 --- a/i2p2www/pages/downloads/macros +++ b/i2p2www/pages/downloads/macros @@ -1,7 +1,7 @@ -{% set i2pinstall_windows_hash = '1aa1ac29620886a7d744424318287c67dc9ead488e6ab434848597ee9db7ce18' %} -{% set i2pinstall_jar_hash = '751f48cfb380c8796bd645621b149114d55f32cd4330784cb287be9413b02569' %} -{% set i2psource_hash = 'f23d0746d72a55cccbd17f40762e491ae1b42cdf55d7e73404d213a84985ca73' %} -{% set i2pupdate_hash = 'adba8b7512d27a44ed876ec4beb39a82ebb34dc243ec024aff289e91823fc0c7' %} +{% set i2pinstall_windows_hash = '13f2e6b3cc9716c89c4d4d3bc9918171fbad5f450171e1c32b1237b5421bc065' %} +{% set i2pinstall_jar_hash = '24cda3f04e8c2e976b73bd45d36d0e31217e28fbe3019bf9a9d839b45d60537a' %} +{% set i2psource_hash = '249b35c1e061e194ee18048b0644cc5e2c5cf785ffce655e3124eb959dc189ff' %} +{% set i2pupdate_hash = '2867d752f6fb89a7a5ada4f4123ca601ad8d78ff78f553a9269bf0ddffe724ca' %} {% set i2p_android_hash = '272acf543c4489dc3775c07c42eb91710b4ed377c78aff605e3d44e73fad5110' %} {% set i2p_macnative_hash = '18cb22cfcc3cbe0cec150e89a394d1a35703cb508ed627ef48084b7ba7c90dde' %} diff --git a/site-updater-docker.sh b/site-updater-docker.sh index c124708b..3ae913b4 100755 --- a/site-updater-docker.sh +++ b/site-updater-docker.sh @@ -52,4 +52,4 @@ cd "$DIR" || exit git pull origin $i2p_www_branch docker build $i2p_www_docker_build_args -t mirror.i2p.www$suffix . docker rm -f mirror.i2p.www$suffix -docker run $i2p_www_docker_run_args --name mirror.i2p.www$suffix -p 0.0.0.0:$port:80 mirror.i2p.www$suffix $@ +docker run -it $i2p_www_docker_run_args --name mirror.i2p.www$suffix -p 127.0.0.1:5000:5000 -p 0.0.0.0:$port:80 $devmode mirror.i2p.www$suffix $@