.dockerignore

@@ -29,3 +29,4 @@ installer/build
 router/java/build
 router/build
 
+override.properties
\ No newline at end of file

.github/workflows/ant-nightly.yml

+name: Daily Workflow
+
+on:
+  schedule:
+    # This runs at 00:00 UTC every day
+    # Cron syntax: minute hour day-of-month month day-of-week
+    - cron: '0 * * * *'
+  workflow_dispatch: # Allows manual triggering
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+jobs:
+  daily-job:
+    runs-on: ubuntu-latest
+
+    # Ensures this only runs on the master branch
+    if: github.ref == 'refs/heads/master'
+
+    steps:
+      - name: GetText
+        run: sudo apt install gettext
+      - uses: actions/checkout@v4
+      - name: Set up JDK 8
+        uses: actions/setup-java@v4
+        with:
+          java-version: '8'
+          distribution: 'temurin'
+      - name : Generate override.properties
+        run: |
+          rm -f override.properties
+          echo "build.built-by=GitHub Actions" >> override.properties
+          echo "noExe=true" >> override.properties
+      - name: build with Ant
+        run: ant distclean pkg
+      - name: Upload installer.jar
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-install-${{ github.sha }}.jar
+          path: install.jar
+
+  javadoc-latest:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup Pages
+        uses: actions/configure-pages@v4
+      - name: GetText
+        run: sudo apt install gettext
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - name : Generate override.properties
+        run: |
+          rm -f override.properties
+          echo "build.built-by=GitHub Actions" >> override.properties
+          echo "noExe=true" >> override.properties
+      - name: test Debian build with Ant
+        run: ant distclean
+      - name: build javadoc with Ant
+        run: ant distclean javadoc updater
+      - name: zip javadoc and place update in javadoc zip
+        run: cp i2pupdate.zip build/javadoc/i2pupdate.zip && zip -r javadoc.zip build/javadoc
+      - name: Upload javadoc.zip
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-javadoc-${{ github.sha }}.zip
+          path: javadoc.zip
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          # Upload javadocs to github page
+          path: 'build/javadoc'
+      - name: Deploy javadoc and dev build to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
+
+  build-java7:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: GetText
+        run: sudo apt install gettext
+      - uses: actions/checkout@v4
+      - name: Set up JDK 8
+        uses: actions/setup-java@v4
+        with:
+          java-version: '8'
+          distribution: 'temurin'
+      - name : Generate override.properties
+        run: |
+          git clone https://github.com/eyedeekay/openjdk-7 "$HOME/openjdk-7"
+          rm -f override.properties
+          echo "build.built-by=GitHub Actions" >> override.properties
+          echo "noExe=true" >> override.properties
+          echo "javac.compilerargs=-bootclasspath $HOME/openjdk-7/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/rt.jar:$HOME/openjdk-7/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/jce.jar -Xlint:all" >> override.properties
+      - name: build Maven dev build with Ant
+        run: ./installer/resources/maven-dev-release.sh 1
+      - name: Upload servlet-i2p.jar
+        uses: actions/upload-artifact@v4
+        with:
+          name: servlet-i2p-${{ github.sha }}.jar
+          path: pkg-mavencentral/servlet-i2p*.jar
+      - name: Upload streaming.jar
+        uses: actions/upload-artifact@v4
+        with:
+          name: streaming-${{ github.sha }}.jar
+          path: pkg-mavencentral/streaming*.jar
+      - name: Upload mstreaming.jar
+        uses: actions/upload-artifact@v4
+        with:
+          name: mstreaming-${{ github.sha }}.jar
+          path: pkg-mavencentral/mstreaming*.jar
+      - name: Upload router.jar
+        uses: actions/upload-artifact@v4
+        with:
+          name: router-${{ github.sha }}.jar
+          path: pkg-mavencentral/router*.jar
+      - name: Upload i2p.jar
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2p-${{ github.sha }}.jar
+          path: pkg-mavencentral/i2p*.jar

.github/workflows/ant.yml

+# Mostly copied from https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-ant
+# zlatinb
+
+name: Java CI
+
+on: [push]
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: GetText
+        run: sudo apt install gettext
+      - uses: actions/checkout@v4
+      - name: Set up JDK 8
+        uses: actions/setup-java@v4
+        with:
+          java-version: '8'
+          distribution: 'temurin'
+      - name : Generate override.properties
+        run: |
+          rm -f override.properties
+          echo "build.built-by=GitHub Actions" >> override.properties
+          echo "noExe=true" >> override.properties
+      - name: build with Ant
+        run: ant distclean pkg
+      - name: Upload installer.jar
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-install-${{ github.sha }}.jar
+          path: install.jar
+
+  javadoc-latest:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup Pages
+        uses: actions/configure-pages@v4
+      - name: GetText
+        run: sudo apt install gettext
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - name : Generate override.properties
+        run: |
+          rm -f override.properties
+          echo "build.built-by=GitHub Actions" >> override.properties
+          echo "noExe=true" >> override.properties
+      - name: test Debian build with Ant
+        run: ant distclean
+      - name: build javadoc with Ant
+        run: ant distclean javadoc updater
+      - name: zip javadoc and place update in javadoc zip
+        run: cp i2pupdate.zip build/javadoc/i2pupdate.zip && zip -r javadoc.zip build/javadoc
+      - name: Upload javadoc.zip
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-javadoc-${{ github.sha }}.zip
+          path: javadoc.zip
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          # Upload javadocs to github page
+          path: 'build/javadoc'
+      - name: Deploy javadoc and dev build to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
+
+  build-java7:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: GetText
+        run: sudo apt install gettext
+      - uses: actions/checkout@v4
+      - name: Set up JDK 8
+        uses: actions/setup-java@v4
+        with:
+          java-version: '8'
+          distribution: 'temurin'
+      - name : Generate override.properties
+        run: |
+          git clone https://github.com/eyedeekay/openjdk-7 "$HOME/openjdk-7"
+          rm -f override.properties
+          echo "build.built-by=GitHub Actions" >> override.properties
+          echo "noExe=true" >> override.properties
+          echo "javac.compilerargs=-bootclasspath $HOME/openjdk-7/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/rt.jar:$HOME/openjdk-7/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/jce.jar -Xlint:all" >> override.properties
+      - name: build Maven dev build with Ant
+        run: ./installer/resources/maven-dev-release.sh 1
+      - name: Upload servlet-i2p.jar
+        uses: actions/upload-artifact@v4
+        with:
+          name: servlet-i2p-${{ github.sha }}.jar
+          path: pkg-mavencentral/servlet-i2p*.jar
+      - name: Upload streaming.jar
+        uses: actions/upload-artifact@v4
+        with:
+          name: streaming-${{ github.sha }}.jar
+          path: pkg-mavencentral/streaming*.jar
+      - name: Upload mstreaming.jar
+        uses: actions/upload-artifact@v4
+        with:
+          name: mstreaming-${{ github.sha }}.jar
+          path: pkg-mavencentral/mstreaming*.jar
+      - name: Upload router.jar
+        uses: actions/upload-artifact@v4
+        with:
+          name: router-${{ github.sha }}.jar
+          path: pkg-mavencentral/router*.jar
+      - name: Upload i2p.jar
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2p-${{ github.sha }}.jar
+          path: pkg-mavencentral/i2p*.jar

.github/workflows/docker.yml

+name: Dockerhub
+
+on:
+  push:
+    tags:
+    - 'i2p-*.*.*'
+    branches:
+    - master
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Set env
+        run:
+          sudo apt-get install -y sed;
+          echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" | sed 's|master|latest|g' >> $GITHUB_ENV
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          tags: geti2p/i2p:${{ env.RELEASE_VERSION }}
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          tags: geti2p/i2p.i2p:${{ env.RELEASE_VERSION }}

.github/workflows/github-sync.yml

+# File: .github/workflows/repo-sync.yml
+
+on:
+  schedule:
+  - cron:  "30 * * * *"
+  workflow_dispatch:
+
+jobs:
+  repo-sync:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        persist-credentials: false
+    - name: repo-sync
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      uses: repo-sync/github-sync@v2
+      with:
+        source_repo: "https://i2pgit.org/i2p-hackers/i2p.i2p"
+        source_branch: "master"
+        destination_branch: "master"
+        github_token: ${{ secrets.PAT }}

.github/workflows/izpack.yml

+name: Java with IzPack Snapshot Setup
+
+on: [push]
+
+permissions:
+  contents: read
+
+jobs:
+  setup:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Install Required Packages
+        run: sudo apt install gettext
+      - name: Checkout Main Repository
+        uses: actions/checkout@v4
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+      - name: Set up Maven
+        uses: stCarolas/setup-maven@v4.5
+        with:
+          maven-version: '3.9.9'
+      - name: Clone IzPack Repository
+        uses: actions/checkout@v4
+        with:
+          repository: 'izpack/izpack'
+          path: 'izpack-source'
+      - name: Build IzPack Snapshot
+        working-directory: ./izpack-source
+        run: |
+          mvn clean install -DskipTests
+          find . -iname 'izpack*.jar'
+          echo "IZPACK_HOME=$GITHUB_WORKSPACE/izpack-source/izpack-dist/target/IzPack" >> $GITHUB_ENV
+          echo "$GITHUB_WORKSPACE/izpack-source/izpack-dist/target/IzPack/bin" >> $GITHUB_PATH
+          cat > auto-install.xml << EOF
+          <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+          <AutomatedInstallation langpack="eng">
+              <com.izforge.izpack.panels.HelloPanel/>
+              <com.izforge.izpack.panels.TargetPanel>
+                  <installpath>/usr/local/IzPack</installpath>
+              </com.izforge.izpack.panels.TargetPanel>
+              <com.izforge.izpack.panels.InstallPanel/>
+              <com.izforge.izpack.panels.FinishPanel/>
+          </AutomatedInstallation>
+          EOF
+
+          # Create installation directory
+          sudo mkdir -p /usr/local/IzPack
+          sudo chmod 777 /usr/local/IzPack
+
+          # Run the installer in headless mode
+          # java -jar ./izpack-dist/target/izpack-dist-*-SNAPSHOT-installer.jar auto-install.xml
+
+          java -DINSTALL_PATH=/usr/local/IzPack -jar ./izpack-dist/target/izpack-dist-*-SNAPSHOT-installer.jar -options-system
+
+          # Update environment
+          echo "/usr/local/IzPack/bin" >> $GITHUB_PATH
+          echo "IZPACK_HOME=/usr/local/IzPack" >> $GITHUB_ENV
+      - name: Generate Properties
+        run: |
+          rm -f override.properties
+          echo "build.built-by=GitHub Actions" >> override.properties
+          echo "izpack.home=${{ env.IZPACK_HOME }}" >> override.properties
+          echo "izpack5.home=${{ env.IZPACK_HOME }}" >> override.properties
+          echo "izpack5.version=5.2.4-SNAPSHOT" >> override.properties
+      - name: Verify Setup
+        run: |
+          java -version
+          ant -version
+          echo "IzPack installation directory: $IZPACK_HOME"
+          ls -l $IZPACK_HOME/bin
+      - name: Upload IzPack Build
+        uses: actions/upload-artifact@v4
+        with:
+          name: izpack-snapshot-${{ github.sha }}
+          path: ${{ env.IZPACK_HOME }}
+          retention-days: 1
+      - name: Cache IzPack Build
+        uses: actions/cache@v3
+        with:
+          path: izpack-source
+          key: izpack-snapshot-${{ github.sha }}
+          restore-keys: |
+            izpack-snapshot-
+      - name: build with Ant - Non Windows
+        run: ant distclean pkg installer5-linux
+      - name: find installer artifacts
+        run: find . -iname 'i2p*.jar'
+      - name: Upload i2pinstall.jar
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2pinstall-${{ github.sha }}.jar
+          path: i2pinstall*.jar
+      - name: build with Ant - Windows
+        run: ant distclean pkg installer5-windows
+      - name: find installer artifacts
+        run: find . -iname 'i2p*.exe'
+      - name: Upload i2pinstall.exe
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2pinstall-${{ github.sha }}.exe
+          path: i2pinstall*.exe

.github/workflows/mirror-release.yml

+name: mirror
+
+on:
+  push:
+    tags:
+    - 'i2p-*.*.*'
+  workflow_dispatch: # Allows manual triggering
+
+jobs:
+  dl:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        sparse-checkout: |
+            changelog.txt
+    - name: download release artifacts
+      run: |
+        sudo apt-get install wget ca-certificates gpg sed curl git
+        export I2P_VERSION=$(echo ${{ github.ref_name }} | sed 's|i2p-||g' |sed 's|-.*||')
+        echo "$I2P_VERSION"
+        export ATTEMPTS=0
+        while true; do
+        sleep 60m
+        wget -v https://files.i2p-projekt.de/"$I2P_VERSION"/i2pinstall_"$I2P_VERSION"_windows.exe && break
+        ATTEMPTS=$(( $ATTEMPTS + 1 ))
+        if [ $ATTEMPTS -eq 25 ]; then
+            exit 1
+        fi
+        done
+        wget -v https://files.i2p-projekt.de/"$I2P_VERSION"/I2P-Easy-Install-Bundle-"$I2P_VERSION"-signed.exe
+        wget -v https://files.i2p-projekt.de/"$I2P_VERSION"/I2P-Easy-Install-Bundle-"$I2P_VERSION".exe
+        wget -v https://files.i2p-projekt.de/"$I2P_VERSION"/i2pinstall_"$I2P_VERSION".jar
+        wget -v https://files.i2p-projekt.de/"$I2P_VERSION"/i2pinstall_"$I2P_VERSION".jar.sig
+        wget -v https://files.i2p-projekt.de/"$I2P_VERSION"/i2pinstall_"$I2P_VERSION"_windows.exe
+        wget -v https://files.i2p-projekt.de/"$I2P_VERSION"/i2pinstall_"$I2P_VERSION"_windows.exe.sig
+        wget -v https://files.i2p-projekt.de/"$I2P_VERSION"/i2psource_"$I2P_VERSION".tar.bz2
+        wget -v https://files.i2p-projekt.de/"$I2P_VERSION"/i2psource_"$I2P_VERSION".tar.bz2.sig
+        wget -v https://files.i2p-projekt.de/"$I2P_VERSION"/i2pupdate-"$I2P_VERSION".su3
+        wget -v https://files.i2p-projekt.de/"$I2P_VERSION"/i2pupdate-"$I2P_VERSION".su3.torrent
+        wget -v https://files.i2p-projekt.de/"$I2P_VERSION"/i2pupdate.su3
+        wget -v https://files.i2p-projekt.de/"$I2P_VERSION"/i2pupdate_"$I2P_VERSION".zip
+        wget -v https://files.i2p-projekt.de/"$I2P_VERSION"/i2pupdate_"$I2P_VERSION".zip.sig'
+        echo ""$I2P_VERSION"" > CHANGES.md
+        echo "===========" >> CHANGES.md
+        echo "" >> CHANGES.md
+        echo "" >> CHANGES.md
+        curl https://raw.githubusercontent.com/i2p/i2p.newsxml/master/data/entries.html | sed -n '/<article/,/<\/article/p' | sed -n '1,/<\/article>/p' | sed -n '/<\/details>/,$p' | sed '1d' | sed 's/<\/\{0,1\}p>//g' | sed 's|<\/article>||g' >> CHANGES.md
+        echo "" >> CHANGES.md
+        echo "" >> CHANGES.md
+        echo '```' >> CHANGES.md
+        head -n 25 changelog.txt >> CHANGES.md
+        echo '```' >> CHANGES.md
+        echo "" >> CHANGES.md
+        echo "" >> CHANGES.md
+        echo "## Checksums" >> CHANGES.md
+        echo "" >> CHANGES.md
+        echo "" >> CHANGES.md
+        echo '```' >> CHANGES.md
+        sha256sum * >> CHANGES.md
+        echo '```' >> CHANGES.md
+        echo "" >> CHANGES.md
+        echo "" >> CHANGES.md
+        echo '```' >> CHANGES.md
+        file * >> CHANGES.md
+        echo '```' >> CHANGES.md
+        echo "" >> CHANGES.md
+        echo "" >> CHANGES.md
+        cat CHANGES.md
+    - name: Upload artifacts
+      uses: ncipollo/release-action@v1
+      with:
+        artifacts: "*"
+        skipIfReleaseExists: true
+        bodyFile: "CHANGES.md"

.gitignore

@@ -61,3 +61,5 @@ sloccount.sc
 
 # TODO: why does this file appear?
 apps/routerconsole/jsp/favicon.ico
+.tx
+/*.sh
\ No newline at end of file

.gitlab-ci.yml

@@ -52,6 +52,7 @@ test:ant:
         - echo junit.home=/usr/share/java >> override.properties
         - echo hamcrest.home=/usr/share/java >> override.properties
         - echo mockito.home=/usr/share/java >> override.properties
+        - echo build.built-by=GitHub Actions >> override.properties
     script:
         - ant test
     only:
@@ -59,19 +60,55 @@ test:ant:
         - merge_requests
         - tags
 
+test:javadoc:
+    stage: test
+    image: debian:unstable-slim
+    variables:
+        SCALA: https://downloads.lightbend.com/scala/2.12.13/scala-2.12.13.deb
+        LIBPREFIX: /usr/share/scala/lib
+        LIB_SCALATEST: https://repo1.maven.org/maven2/org/scalatest/scalatest_2.12/3.0.4/scalatest_2.12-3.0.4.jar
+        LIB_SCALACTIC: https://repo1.maven.org/maven2/org/scalactic/scalactic_2.12/3.0.4/scalactic_2.12-3.0.4.jar
+    before_script:
+        # Fix bug installing openjdk-11-jdk-headless's manuals
+        - mkdir -p /usr/share/man/man1/
+        - apt-get update -q
+        - apt-get install -y wget gettext
+            ant openjdk-21-jdk-headless
+            libmockito-java libhamcrest-java junit4
+        # Install specific version of scala
+        - wget -qO scala.deb "${SCALA}"
+        - dpkg -i scala.deb
+        # link to the scala libs with the name `ant test` expects
+        - ln -s "${LIBPREFIX}/scala-xml_2.12-1.0.6.jar" "${LIBPREFIX}/scala-xml.jar"
+        # Download required scala libs
+        - wget -qO "${LIBPREFIX}/scalactic.jar" "${LIB_SCALACTIC}"
+        - wget -qO "${LIBPREFIX}/scalatest.jar" "${LIB_SCALATEST}"
+        # Point ant to the right directories
+        - echo scalatest.libs=/usr/share/scala/lib > override.properties
+        - echo junit.home=/usr/share/java >> override.properties
+        - echo hamcrest.home=/usr/share/java >> override.properties
+        - echo mockito.home=/usr/share/java >> override.properties
+        - echo build.built-by=GitHub Actions >> override.properties
+    script:
+        - ant javadoc
+    only:
+        - master
+        - merge_requests
+        - tags
+
 # Make sure we can build a docker image
 # It's cached for later jobs
 build_docker:
     stage: build
-    image: docker:19.03.12
+    image: docker:24.0.7
     services:
-        - docker:19.03.12-dind
+        - docker:24.0.7-dind
     script:
         # Try to load latest branch image from local tar or from registry
         - docker load -i ci-exports/$CI_COMMIT_REF_SLUG.tar || docker pull $CI_REGISTRY_IMAGE:latest || true
         - docker build --cache-from $CI_REGISTRY_IMAGE:latest --tag $CI_REGISTRY_IMAGE:latest .
         - mkdir -p ci-exports/
-        - docker save $CI_REGISTRY_IMAGE:latest > ci-exports/$CI_COMMIT_REF_SLUG.tar
+        - echo docker save $CI_REGISTRY_IMAGE:latest > ci-exports/$CI_COMMIT_REF_SLUG.tar
     variables:
         # When using dind service, we need to instruct docker to talk with
         # the daemon started inside of the service. The daemon is available
@@ -89,7 +126,7 @@ build_docker:
         # container, thanks to volume mount from config.toml
         DOCKER_TLS_CERTDIR: "/certs"
         # Use TLS https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled
-        DOCKER_HOST: tcp://docker:2376
+        # DOCKER_HOST: tcp://docker:2376
     cache:
         # The same key should be used across branches
         key: "$CI_COMMIT_REF_SLUG"

Docker.md

 # I2P in Docker
 
+### Very quick start
+If you just want to give I2P a quick try or are using it on a home network, follow these steps:
+
+1. Create two directories `i2pconfig` and `i2ptorrents`
+2. Create an `.env` file containing the `EXT_PORT` environment variable.
+3. Copy the following text and save it in a file `docker-compose.yml`
+```
+version: "3.5"
+services:
+    i2p:
+        image: geti2p/i2p
+        ports:
+            - 127.0.0.1:4444:4444
+            - 127.0.0.1:6668:6668
+            - 127.0.0.1:7657:7657
+            - "$EXT_PORT":"$EXT_PORT"
+            - "$EXT_PORT":"$EXT_PORT"/udp
+        volumes:
+            - ./i2pconfig:/i2p/.i2p
+            - ./i2ptorrents:/i2psnark
+```
+4. Execute `docker-compose up`
+5. Start a browser and go to `http://127.0.0.1:7657` to complete the setup wizard.
+
+Note that this quick-start approach is not recommended for production deployments on remote servers.  Please read the rest of this document for more information.
+
 ### Building an image
 There is an i2P image available over at [DockerHub](https://hub.docker.com).  If you do not want to use that one, you can build one yourself:
 ```
-docker build -t i2p .
+docker build -t geti2p/i2p .
 ```
 
 ### Running a container
 
+#### Environment Variables
+
+It is possible to set the IP address where the I2P router is accessible by setting
+the `IP_ADDR` environment variable in your `docker run` command or your `docker-compose`
+file. For example, if you want to make your I2P router listen on all addresses, then
+you should pass `-e IP_ADDR=0.0.0.0` to your `docker run` command.
+
+It is also possible to configure the memory available to the I2P router using
+environment variables. To do this, use the: `JVM_XMX` environment variable by passing,
+for example, `-e JVM_XMX=256m`.
+
 #### Volumes
 The container requires a volume for the configuration data to be mounted.  Optionally, you can mount a separate volume for torrent ("i2psnark") downloads.  See the example below.
 
@@ -17,33 +54,41 @@ By the default the image limits the memory available to the Java heap to 512MB.
 #### Ports
 There are several ports which are exposed by the image.  You can choose which ones to publish depending on your specific needs.
 
-|Port|Description|TCP/UDP|
-|---|---|---|
-|4444|HTTP Proxy|TCP|
-|4445|HTTPS Proxy|TCP|
-|6668|IRC Proxy|TCP|
-|7654|I2CP Protocol|TCP|
-|7656|SAM Bridge TCP|TCP|
-|7657|Router console|TCP|
-|7658|I2P Site|TCP|
-|7659|SMTP Proxy|TCP|
-|7660|POP Proxy|TCP|
-|12345|I2NP Protocol|TCP and UDP|
+|Port|Interface|Description|TCP/UDP|
+|---|---|---|---|
+|4444|127.0.0.1|HTTP Proxy|TCP|
+|4445|127.0.0.1|HTTPS Proxy|TCP|
+|6668|127.0.0.1|IRC Proxy|TCP|
+|7654|127.0.0.1|I2CP Protocol|TCP|
+|7656|127.0.0.1|SAM Bridge TCP|TCP|
+|7657|127.0.0.1|Router console|TCP|
+|7658|127.0.0.1|I2P Site|TCP|
+|7659|127.0.0.1|SMTP Proxy|TCP|
+|7660|127.0.0.1|POP Proxy|TCP|
+|7652|LAN interface|UPnP|TCP|
+|7653|LAN interface|UPnP|UDP|
+|12345|0.0.0.0|I2NP Protocol|TCP and UDP|
 
 You probably want at least the Router Console (7657)  and the HTTP Proxy (4444).  If you want I2P to be able to receive incoming connections from the internet, and hence not think it's firewalled, publish the I2NP Protocol port (12345) - but make sure you publish to a different random port, otherwise others may be able to guess you're running I2P in a Docker image.
 
+#### Networking
+A best-practices guide for cloud deployments is beyond the scope of this document, but in general you should try to minimize the number of published ports, while exposing only the `I2NP` ports to the internet.  That means that the services in the list above which are bound to `127.0.0.1` (which include the router console) will need to be accessed via other methods like ssh tunneling or be manually configured to bind to a different interface.
+
 #### Example
 Here is an example container that mounts `i2phome` as home directory, `i2ptorrents` for torrents, and opens HTTP Proxy, IRC, Router Console and I2NP Protocols.  It also limits the memory available to the JVM to 256MB.
+
 ```
+docker build -t geti2p/i2p .
+# I2NP port needs TCP and UDP.  Change the 54321 to something random, greater than 1024.
 docker run \
     -e JVM_XMX=256m \
+    -e EXT_PORT=54321 \
     -v i2phome:/i2p/.i2p \
     -v i2ptorrents:/i2psnark \
-    -p 4444:4444 \
-    -p 6668:6668 \
-    -p 7657:7657 \
-    -p 54321:12345 \
-    -p 54321:12345/udp \  # I2NP port needs TCP and UDP.  Change the 54321 to something random, greater than 1024.
-    i2p:latest
+    -p 127.0.0.1:4444:4444 \
+    -p 127.0.0.1:6668:6668 \
+    -p 127.0.0.1:7657:7657 \
+    -p "$EXT_PORT":"$EXT_PORT" \
+    -p "$EXT_PORT":"$EXT_PORT"/udp \
+    geti2p/i2p:latest
 ```
-

Dockerfile

-FROM jlesage/baseimage:alpine-3.15-glibc as builder
+FROM docker.io/eclipse-temurin:17-alpine as builder
 
 ENV APP_HOME="/i2p"
+ARG ANT_VERSION="1.10.15"
 
 WORKDIR /tmp/build
 COPY . .
 
-RUN add-pkg --virtual build-base gettext tar bzip2 apache-ant openjdk8 \
-    && ant preppkg-linux-only \
-    && rm -rf pkg-temp/osid pkg-temp/lib/wrapper pkg-temp/lib/wrapper.* \
-    && del-pkg build-base gettext tar bzip2 apache-ant openjdk8
+RUN apk add --no-cache gettext tar bzip2 curl \
+    && echo "build.built-by=Docker" >> override.properties \
+    && curl https://dlcdn.apache.org//ant/binaries/apache-ant-${ANT_VERSION}-bin.tar.bz2 | tar -jxf - -C /opt \
+    && /opt/apache-ant-${ANT_VERSION}/bin/ant preppkg-linux-only \
+    && rm -rf pkg-temp/osid pkg-temp/lib/wrapper pkg-temp/lib/wrapper.*
 
-FROM jlesage/baseimage:alpine-3.15-glibc
+FROM docker.io/eclipse-temurin:17-jre-alpine
 ENV APP_HOME="/i2p"
 
-RUN add-pkg openjdk8-jre
 WORKDIR ${APP_HOME}
 COPY --from=builder /tmp/build/pkg-temp .
 
 # "install" i2p by copying over installed files
-COPY docker/rootfs/ /
+COPY --chown=root:root docker/rootfs/ /
+RUN chmod +x /startapp.sh
 
 # Mount home and snark
 VOLUME ["${APP_HOME}/.i2p"]
@@ -34,3 +36,4 @@ LABEL \
       org.label-schema.vcs-url="https://github.com/i2p/i2p.i2p" \
       org.label-schema.schema-version="1.0"
 
+ENTRYPOINT ["/startapp.sh"]

INSTALL-headless.txt

@@ -44,6 +44,4 @@ Supported JVMs:
   Windows: OpenJDK or Oracle from http://java.com/download
   Linux:   OpenJDK or Oracle from http://java.com/download
   FreeBSD: OpenJDK or Oracle from http://java.com/download
-  Raspberry Pi: Oracle 8 Early Access https://jdk8.java.net/download.html
-  PowerPC: IBM SDK 7 http://www.ibm.com/developerworks/java/jdk/linux/download.html
-  Other operating systems and JVMs: See https://trac.i2p2.de/wiki/java or https://geti2p.net/download
+  Other operating systems and JVMs: See https://geti2p.net/download

INSTALL.txt

@@ -65,7 +65,7 @@ To uninstall I2P:
    rm -rf $I2PInstallDir ~/.i2p
 
 Supported JVMs:
-  Windows: Latest available from http://java.com/download (1.7+ supported)
-  Linux:   Latest available from http://java.com/download (1.7+ supported)
-  FreeBSD: 1.7-compatible (NIO required)
-  Other operating systems and JVMs: See http://trac.i2p2.de/wiki/java
+  All platforms: Java 1.8 or higher required
+  Windows: Latest available from http://java.com/download
+  Linux:   Latest available from http://java.com/download
+  Other operating systems and JVMs: See https://geti2p.net/download

LICENSE.txt

@@ -128,10 +128,6 @@ Public domain except as listed below:
    Copyright (C) 2006 The Android Open Source Project
    See licenses/LICENSE-Apache2.0.txt
 
-   SSU HMAC:
-   Copyright (c) 2000 - 2004 The Legion Of The Bouncy Castle
-   See licenses/LICENSE-SHA256.txt
-
 
 Installer:
    (not included in distribution packages)
@@ -212,10 +208,6 @@ Applications:
        Copyright (c) 2006, Matthew Estes
        See licenses/LICENSE-BlockFile.txt
 
-   BOB (BOB.jar):
-   Copyright (C) sponge
-   See licenses/COPYING-BOB.txt
-
    Desktopgui (desktopgui.jar):
    Copyright (c) Mathias De Maré
    See licenses/LICENSE-DesktopGUI.txt
@@ -271,7 +263,7 @@ Applications:
    See licenses/LICENSE-Apache2.0.txt
    See licenses/LICENSE-ECLIPSE-1.0.html
 
-   RRD4J 3.8 (jrobin.jar):
+   RRD4J 3.10 (jrobin.jar):
    Copyright (c) 2001-2005 Sasa Markovic and Ciaran Treanor.
    Copyright (c) 2011 The OpenNMS Group, Inc.
    Copyright 2011 The RRD4J Authors.
@@ -320,6 +312,10 @@ Applications:
    See licenses/LICENSE-NDT.txt
    Notice: I2P has changed specified portions of the Software, including the package edu.internet2.ndt.
 
+   Router Console Iframe-resizer 4.3.9:
+   Copyright (c) 2013-2023 David J. Bradshaw
+   See licenses/LICENSE-Iframe-resizer.txt
+
    SAM (sam.jar):
    Public domain.
 
@@ -336,12 +332,19 @@ Applications:
    GPLv2 (or any later version)
    See licenses/LICENSE-GPLv2.txt
 
+   SusiMail Pagedown:
+   Original Markdown Copyright (c) 2004-2005 John Gruber
+   Original Showdown code copyright (c) 2007 John Fraser
+   Modifications and bugfixes (c) 2009 Dana Robinson
+   Modifications and bugfixes (c) 2009-2014 Stack Exchange Inc.
+   See licenses/LICENSE-pagedown.txt
+
    Systray (systray.jar):
    Public domain.
 
-   Tomcat 9.0.54 (jasper-runtime.jar):
+   Tomcat 9.0.88 (jasper-runtime.jar):
    (not included in most distribution packages)
-   Copyright 1999-2021 The Apache Software Foundation
+   Copyright 1999-2024 The Apache Software Foundation
    See licenses/LICENSE-Apache2.0.txt
    See licenses/NOTICE-Tomcat.txt
 
@@ -355,7 +358,7 @@ distributions. See the source package for the additional license information.
    Admin Manager:
    Public domain
 
-   Gradle wrapper 5.2.1:
+   Gradle wrapper 8.5:
    (not included in most distribution packages)
-   Copyright (c) 2017 the original author or authors.
+   Copyright (c) 2023 the original author or authors.
    See licenses/LICENSE-Apache2.0.txt

README.md

@@ -64,6 +64,9 @@ your `~/.gradle/gradle.properties`:
     systemProp.socksProxyHost=localhost
     systemProp.socksProxyPort=9150
 
+### Development builds
+Automatic CI builds are available at the [continuous integration](https://github.com/i2p/i2p.i2p/actions/workflows/ant.yml) page.
+
 ### Docker
 For more information how to run I2P in Docker, see [Docker.md](Docker.md)
 ## Contact info

apps/BOB/bob.config

-#bob.config
-#Tue Dec 30 00:00:00 UTC 2008
-# Please leave this file here for testing.
-# Thank you,
-# Sponge
-i2cp.tcp.port=7654
-BOB.host=localhost
-inbound.lengthVariance=0
-i2cp.messageReliability=BestEffort
-BOB.port=45678
-outbound.length=1
-inbound.length=1
-outbound.lengthVariance=0
-i2cp.tcp.host=localhost

apps/BOB/build.gradle

-sourceSets {
-    main {
-        java {
-            srcDir 'src'
-        }
-    }
-}
-
-dependencies {
-    compile project(':core')
-    compile project(':apps:ministreaming')
-}

apps/BOB/build.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
-<project name="BOB" default="default" basedir=".">
-    <description>Builds, tests, and runs the project BOB.</description>
-    <import file="nbproject/build-impl.xml"/>
-    <!--
-
-    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
-
-      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
-
-    (Targets beginning with '-' are not intended to be called on their own.)
-
-    Example of inserting an obfuscator after compilation could look like this:
-
-        <target name="-post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
-
-
-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
-
-      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
-      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
-
-    An example of overriding the target for project execution could look like this:
-
-        <target name="run" depends="BOB-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
-
-    -->
-
-    <target depends="jar" description="Build BOB into a SINGLE JAR." name="onejar">
-	<!-- Make needed working dirs -->
-	<mkdir dir="${dist.dir}/lib" />
-	<mkdir dir="${dist.dir}/classes" />
-
-	<!-- Copy jars -->
-	<copy todir="${dist.dir}/lib" flatten="true" >
-	    <path>
-	        <pathelement path="${javac.classpath}" />
-	    </path>
-	</copy>
-	<copy todir="${dist.dir}/lib" file="../../build/jbigi.jar" />
-
-	<!-- Extract the classes inside the jar files -->
-	<unjar dest="${dist.dir}/classes" >
-            <fileset dir="${dist.dir}/lib" >
-                <include name="**/*.jar" />
-            </fileset>
-        </unjar>
-
-        <!-- Recombine the classes into a new jar file -->
-	<jar jarfile="${dist.dir}/lib/all-in-one.jar" >
-	    <fileset dir="${dist.dir}/classes" />
-        </jar>
-
-        <!-- Clean up work area -->        
-        <delete dir="${dist.dir}/classes" followsymlinks="false" includeemptydirs="true"/>
-
-        <!-- Make the single jar file -->
-        <jar jarfile="dist/BOB-one.jar" >
-            <zipfileset src="${dist.jar}" excludes="META-INF/*" />
-            <zipfileset src="${dist.dir}/lib/all-in-one.jar" excludes="**/META-INF/*" />
-            <manifest>
-                <attribute name="Main-Class" value="net.i2p.BOB.Main" />
-            </manifest>
-        </jar>
-
-        <!-- Clean up the fake jar file -->
-        <delete file="${dist.dir}/lib/all-in-one.jar" />
-    </target>
-</project>

apps/BOB/manifest.mf

-Manifest-Version: 1.0
-X-COMMENT: Main-Class will be added automatically by build
-