bump version number to 1.05.0 since it's embedding a 1.5 I2P router and it is version 04 of the profile. Embedding a router being a huge milestone, after all.

Add a Dockerfile and Docker instructions

Closes #6

See merge request i2p-hackers/i2p.firefox!4

Dockerfile

@@ -0,0 +1,10 @@
+FROM alpine:latest
+RUN apk update && apk add firefox make curl musl-locales dbus-x11 font-ubuntu-nerd jq --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing
+ADD . /src
+WORKDIR /src
+RUN make profile.tgz # && \
+RUN chown -R 1000:1000 /src/build/profile # && \
+RUN chmod -R +w /src/build/profile
+RUN ls -lah /src/build/profile
+#USER 1000
+CMD sh -c 'cd build/profile && ./i2pbrowser.sh'

HTTPSEverywhere.url

@@ -1 +1 @@
-https://addons.mozilla.org/firefox/downloads/file/3716461/2021.7.13/https_everywhere-2021.7.13-an+fx.xpi
+https://addons.mozilla.org/firefox/downloads/file/3809748/2021.7.13/https-everywhere-eff@eff.org.xpi

Makefile

@@ -103,7 +103,7 @@ profile: build/profile/user.js build/profile/prefs.js build/profile/bookmarks.ht
 profile.tgz: .version profile
 #	$(eval PROFILE_VERSION := $(shell cat src/profile/version.txt))
 	@echo "building profile tarball $(PROFILE_VERSION)"
-	bash -c 'ls I2P && cp -rv build/I2P build/profile/I2P'; true
+	sh -c 'ls I2P && cp -rv build/I2P build/profile/I2P'; true
 	install -m755 src/unix/i2pbrowser.sh build/profile/i2pbrowser.sh
 	cd build && tar -czf profile-$(PROFILE_VERSION).tgz profile && cp profile-$(PROFILE_VERSION).tgz ../
 
@@ -119,17 +119,17 @@ build/profile/bookmarks.html: build/profile src/profile/bookmarks.html
 build/profile/storage-sync.sqlite: build/profile src/profile/storage-sync.sqlite
 	cp src/profile/storage-sync.sqlite build/profile/storage-sync.sqlite
 
-copy-xpi: build/NoScript.xpi build/HTTPSEverywhere.xpi build/i2prhz@eyedeekay.github.io.xpi build/profile/extensions
+copy-xpi: build/NoScript.xpi build/HTTPSEverywhere.xpi build/i2ppb@eyedeekay.github.io.xpi build/profile/extensions
 	cp build/NoScript.xpi "build/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
 	cp build/HTTPSEverywhere.xpi "build/profile/extensions/https-everywhere-eff@eff.org.xpi"
-	cp build/i2prhz@eyedeekay.github.io.xpi build/profile/extensions/i2prhz@eyedeekay.github.io.xpi
+	cp build/i2ppb@eyedeekay.github.io.xpi build/profile/extensions/i2ppb@eyedeekay.github.io.xpi
 
 app-profile: .version build/app-profile/user.js build/app-profile/prefs.js build/app-profile/chrome/userChrome.css build/app-profile/bookmarks.html build/app-profile/storage-sync.sqlite copy-app-xpi
 
 app-profile.tgz: app-profile
 #	$(eval PROFILE_VERSION := $(shell cat src/app-profile/version.txt))
 	@echo "building app-profile tarball $(PROFILE_VERSION)"
-	bash -c 'ls I2P && cp -rv build/I2P build/app-profile/I2P'; true
+	sh -c 'ls I2P && cp -rv build/I2P build/app-profile/I2P'; true
 	install -m755 src/unix/i2pconfig.sh build/app-profile/i2pconfig.sh
 	cd build && tar -czf app-profile-$(PROFILE_VERSION).tgz app-profile && cp app-profile-$(PROFILE_VERSION).tgz ../
 
@@ -148,17 +148,19 @@ build/app-profile/bookmarks.html: build/app-profile src/app-profile/bookmarks.ht
 build/app-profile/storage-sync.sqlite: build/app-profile src/app-profile/storage-sync.sqlite
 	cp src/app-profile/storage-sync.sqlite build/app-profile/storage-sync.sqlite
 
-copy-app-xpi: build/NoScript.xpi build/HTTPSEverywhere.xpi build/i2prhz@eyedeekay.github.io.xpi build/app-profile/extensions
+copy-app-xpi: build/NoScript.xpi build/HTTPSEverywhere.xpi build/i2ppb@eyedeekay.github.io.xpi build/app-profile/extensions
 	cp build/HTTPSEverywhere.xpi "build/app-profile/extensions/https-everywhere-eff@eff.org.xpi"
-	cp build/i2prhz@eyedeekay.github.io.xpi build/app-profile/extensions/i2prhz@eyedeekay.github.io.xpi
+	cp build/i2ppb@eyedeekay.github.io.xpi build/app-profile/extensions/i2ppb@eyedeekay.github.io.xpi
 
-build/i2prhz@eyedeekay.github.io.xpi:
-	curl -L `cat i2psetproxy.url` > build/i2prhz@eyedeekay.github.io.xpi
+build-extensions: build/i2ppb@eyedeekay.github.io.xpi build/NoScript.xpi build/HTTPSEverywhere.xpi
+
+build/i2ppb@eyedeekay.github.io.xpi: i2psetproxy.url
+	curl -L `cat i2psetproxy.url` > build/i2ppb@eyedeekay.github.io.xpi
 
 build/NoScript.xpi: NoScript.url
 	curl -L `cat NoScript.url` > build/NoScript.xpi
 
-build/HTTPSEverywhere.xpi : HTTPSEverywhere.url
+build/HTTPSEverywhere.xpi: HTTPSEverywhere.url
 	curl -L `cat HTTPSEverywhere.url` > build/HTTPSEverywhere.xpi
 
 clean-extensions:
@@ -167,13 +169,16 @@ clean-extensions:
 extensions:HTTPSEverywhere.url NoScript.url i2psetproxy.url
 
 HTTPSEverywhere.url:
-	@echo "https://addons.mozilla.org/firefox/downloads/file/3716461/"`./amo-version.sh https-everywhere`"/https_everywhere-"`./amo-version.sh https-everywhere`"-an+fx.xpi" > HTTPSEverywhere.url
+	@echo "https://addons.mozilla.org/firefox/downloads/file/3809748/"`./amo-version.sh https-everywhere`"/https-everywhere-eff@eff.org.xpi" > HTTPSEverywhere.url
 
 NoScript.url:
 	@echo "https://addons.mozilla.org/firefox/downloads/file/3534184/"`./amo-version.sh noscript`"/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" > NoScript.url
 
 i2psetproxy.url:
-	@echo "https://addons.mozilla.org/firefox/downloads/file/3784917/"`./amo-version.sh i2pipb-rhizome-variant`"/i2prhz@eyedeekay.github.io" > i2psetproxy.url
+	@echo "https://addons.mozilla.org/firefox/downloads/file/3821635/"`./amo-version.sh i2p-in-private-browsing`"/i2ppb@eyedeekay.github.io.xpi" > i2psetproxy.url
+
+#https://addons.mozilla.org/firefox/downloads/file/3821635/i2p_in_private_browsing-0.112.1-an+fx.xpi
+#i2ppb@eyedeekay.github.io.xpi
 
 build/profile/extensions: build/profile
 	mkdir -p build/profile/extensions
@@ -258,3 +263,17 @@ $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools:
 
 su3: $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools
 	$(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools -name "I2P-Profile-Installer-$(PROFILE_VERSION)" -signer "$(SIGNER)" -version "$(I2P_VERSION)"
+
+docker:
+	docker build -t geti2p/i2p.firefox .
+
+xhost:
+	xhost + local:docker
+
+run: docker xhost
+	docker run -it --rm \
+		--net=host \
+		-e DISPLAY=unix$(DISPLAY) \
+		-v /tmp/.X11-unix:/tmp/.X11-unix \
+		geti2p/i2p.firefox firefox --profile /src/build/profile
+		

README.md

@@ -207,6 +207,25 @@ With that dependency satisfied, you can then run:
 to build the signing tool if necessary and then package the installer in a
 signed update file.
 
+Docker Support
+--------------
+
+You can use a Docker container to install this browser profile as well. In order
+to do this, you can run the commands:
+
+        xhost + local:docker
+        docker run -it --rm \
+          --net=host \
+          -e DISPLAY=unix$(DISPLAY) \
+          -v /tmp/.X11-unix:/tmp/.X11-unix \
+          geti2p/i2p.firefox firefox --profile /src/build/profile
+
+To build and run the container locally, clone this repository and run the
+
+        make run
+
+target.
+
 Issues
 ------
 

i2psetproxy.url

@@ -1 +1 @@
-https://addons.mozilla.org/firefox/downloads/file/3784917/0.108/i2prhz@eyedeekay.github.io
+https://addons.mozilla.org/firefox/downloads/file/3821635/0.112.1/i2ppb@eyedeekay.github.io.xpi

src/nsis/i2pbrowser-installer.nsi

@@ -310,7 +310,7 @@ Section Install
     SetOutPath "$INSTDIR\firefox.profile.i2p\extensions"
     File "profile\extensions\{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
     File profile\extensions\https-everywhere-eff@eff.org.xpi
-    File profile\extensions\i2prhz@eyedeekay.github.io.xpi
+    File profile\extensions\i2ppb@eyedeekay.github.io.xpi
 
     # Install the config profile
     createDirectory "$INSTDIR\firefox.profile.config.i2p"
@@ -324,7 +324,7 @@ Section Install
     createDirectory "$INSTDIR\firefox.profile.config.i2p\extensions"
     SetOutPath "$INSTDIR\firefox.profile.config.i2p\extensions"
     File profile\extensions\https-everywhere-eff@eff.org.xpi
-    File profile\extensions\i2prhz@eyedeekay.github.io.xpi
+    File profile\extensions\i2ppb@eyedeekay.github.io.xpi
 
     # Install the config userChrome
     createDirectory "$INSTDIR\firefox.profile.config.i2p\chrome"
@@ -414,10 +414,10 @@ Section "uninstall"
     # Uninstall the extensions
     Delete "$INSTDIR\firefox.profile.i2p\extensions\{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
     Delete "$INSTDIR\firefox.profile.i2p\extensions\https-everywhere-eff@eff.org.xpi"
-    Delete "$INSTDIR\firefox.profile.i2p\extensions\i2prhz@eyedeekay.github.io.xpi"
+    Delete "$INSTDIR\firefox.profile.i2p\extensions\i2ppb@eyedeekay.github.io.xpi"
 
     Delete "$INSTDIR\firefox.profile.config.i2p\extensions\https-everywhere-eff@eff.org.xpi"
-    Delete "$INSTDIR\firefox.profile.config.i2p\extensions\i2prhz@eyedeekay.github.io.xpi"
+    Delete "$INSTDIR\firefox.profile.config.i2p\extensions\i2ppb@eyedeekay.github.io.xpi"
 
     Delete "$INSTDIR\firefox.profile.config.i2p\config\userChrome.css"
 

src/nsis/i2pbrowser-version.nsi

@@ -1,3 +1,3 @@
-!define VERSIONMAJOR 0
-!define VERSIONMINOR 04
+!define VERSIONMAJOR 1
+!define VERSIONMINOR 05
 !define VERSIONBUILD 0

src/unix/i2pbrowser.sh

@@ -40,4 +40,5 @@ if [ -z $FIREFOX ]; then
   exit 1
 fi
 
-$FIREFOX --profile "$BROWSING_PROFILE" $@
+echo $FIREFOX --profile "$BROWSING_PROFILE" $@
+$FIREFOX --profile "$BROWSING_PROFILE" $@