diff --git a/.dockerignore b/.dockerignore index 191381e..514a353 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1,4 @@ -.git \ No newline at end of file +/.git +/plugin +/i2pbrowser +/i2p.plugins.firefox \ No newline at end of file diff --git a/Dockerfile.fedora b/Dockerfile.fedora index 480e7ec..7194627 100644 --- a/Dockerfile.fedora +++ b/Dockerfile.fedora @@ -1,6 +1,14 @@ -FROM fedora -RUN yum -y update -RUN yum -y install rpm-build +FROM fedora:36 +# Note, +RUN echo [Adoptium] >> /etc/yum.repos.d/adoptium.repo +RUN echo name=Adoptium >> /etc/yum.repos.d/adoptium.repo +RUN . /etc/os-release; echo baseurl=https://packages.adoptium.net/artifactory/rpm/fedora/$VERSION_ID/x86_64/ >> /etc/yum.repos.d/adoptium.repo +RUN echo enabled=1 >> /etc/yum.repos.d/adoptium.repo +RUN echo gpgcheck=1 >> /etc/yum.repos.d/adoptium.repo +RUN echo gpgkey=https://packages.adoptium.net/artifactory/api/gpg/key/public >> /etc/yum.repos.d/adoptium.repo +RUN cat /etc/yum.repos.d/adoptium.repo +RUN dnf clean all && rm -r /var/cache/dnf && dnf upgrade -y && dnf update -y +RUN dnf -y install rpm-build temurin-19-jdk ADD . /src/i2p.plugins.firefox WORKDIR /src/i2p.plugins.firefox CMD ./fedora-docker.sh diff --git a/fedora-docker.sh b/fedora-docker.sh index fe176a2..4158311 100755 --- a/fedora-docker.sh +++ b/fedora-docker.sh @@ -2,16 +2,8 @@ . ./config.sh -cat < /etc/yum.repos.d/adoptium.repo -[Adoptium] -name=Adoptium -baseurl=https://packages.adoptium.net/artifactory/rpm/${DISTRIBUTION_NAME:-$(. /etc/os-release; echo $ID)}/\$releasever/\$basearch -enabled=1 -gpgcheck=1 -gpgkey=https://packages.adoptium.net/artifactory/api/gpg/key/public -EOF -yum -y update -yum -y install temurin-19-jdk +dnf -y update +dnf -y install temurin-19-jdk jpackage --verbose \ --type rpm \ diff --git a/i2p.plugins.firefox.torrent b/i2p.plugins.firefox.torrent index 10319bd..25da26b 100644 Binary files a/i2p.plugins.firefox.torrent and b/i2p.plugins.firefox.torrent differ diff --git a/scripts/build.number b/scripts/build.number index 914205a..b4912da 100644 --- a/scripts/build.number +++ b/scripts/build.number @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Thu Dec 22 22:46:17 UTC 2022 -build.number=387 +#Thu Dec 22 22:59:36 UTC 2022 +build.number=394