switch to caching more packages in docker build

This commit is contained in:
idk
2022-12-23 00:37:28 +00:00
parent 9a5c4275a6
commit 125ed9bdda
5 changed files with 19 additions and 16 deletions

View File

@ -1 +1,4 @@
.git
/.git
/plugin
/i2pbrowser
/i2p.plugins.firefox

View File

@ -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

View File

@ -2,16 +2,8 @@
. ./config.sh
cat <<EOF > /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 \

Binary file not shown.

View File

@ -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