Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08ca27c7 authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Update pkg/arch/PKGBUILD, docker/Dockerfile.arch

parent 09520ce2
Loading
Loading
Loading
Loading
+17 −2
Original line number Diff line number Diff line
@@ -2,21 +2,36 @@ FROM archlinux:base-devel

# update pacman and install sudo git openssh
RUN pacman -Syyu --noconfirm && \
    pacman -Syy --noconfirm --noprogressbar sudo git openssh && \
    pacman -Syy --noconfirm --noprogressbar sudo git openssh wget && \
    yes | pacman -Scc && rm -fr /var/lib/pacman/sync/*1

# add a non-root user and allowing running as root with password
RUN useradd -m builder && \
    echo "builder ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers 

#RUN mkdir /usr/lib/jdk && \
#        cd /usr/lib/jdk && \
#        wget https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.15_10.tar.gz && \ 
#        tar -xvf OpenJDK11U-jdk_x64_linux_hotspot_11.0.15_10.tar.gz

#RUN echo 'PATH="${PATH}:/usr/lib/jdk/jdk-11.0.15+10/bin"' >> /etc/environment && \
#        echo 'JAVA_HOME="/usr/lib/jdk/jdk-11.0.15+10"' >> /etc/environment && \
#        rm /usr/lib/jdk/OpenJDK11U-jdk_x64_linux_hotspot_11.0.15_10.tar.gz 

# make /home/builder working directory
WORKDIR /home/builder

# run as user
USER builder

# Install Java 11.0.15 https://aur.archlinux.org/packages/jdk11
RUN git clone https://aur.archlinux.org/jdk11.git && \
    cd jdk11 && \
    makepkg -si

# install build dependencies
RUN mkdir /home/builder/pkg &&\
RUN source /etc/environment &&\
    mkdir /home/builder/pkg &&\
    curl -o '/home/builder/pkg/PKGBUILD' https://gitlab.e.foundation/e/devices/easy-installer/-/raw/master/pkg/arch/PKGBUILD && \
    cd /home/builder/pkg/ && \
    sudo pacman -Syyu --noconfirm && \
+1 −3
Original line number Diff line number Diff line
@@ -9,8 +9,7 @@ url="https://gitlab.e.foundation/e/tools/${pkgname}"
license=('GPL3')
depends=()
# required java version
_reqjava=11
makedepends=('git' 'gradle' "java-environment-openjdk=${_reqjava}" 'java-runtime-common' 'ruby-ronn')
makedepends=('git' 'gradle' 'ruby-ronn')
optdepends=()
backup=()
source=("${pkgname}-${pkgver}::git+https://gitlab.e.foundation/e/tools/${pkgname}.git#tag=v${pkgver}"
@@ -24,7 +23,6 @@ MAN8PAGE=${pkgname}.8

build(){
    cd "$pkgname-$pkgver"
    export JAVA_HOME="/usr/lib/jvm/java-${_reqjava}-openjdk"
    [ ! -d $JAVA_HOME ] && echo "ERROR: $JAVA_HOME does not exist" && exit 3
    ./gradlew dist
}