|
@@ -1,7 +1,7 @@
|
|
|
FROM docker.io/archlinux
|
|
FROM docker.io/archlinux
|
|
|
|
|
|
|
|
RUN pacman -Syu --noconfirm
|
|
RUN pacman -Syu --noconfirm
|
|
|
-RUN pacman -S --noconfirm jdk8-openjdk unzip wget cmake openssl pkgconf gcc git
|
|
|
|
|
|
|
+RUN pacman -S --noconfirm jdk17-openjdk unzip wget cmake openssl pkgconf gcc git zip
|
|
|
|
|
|
|
|
# github override HOME, so here we are
|
|
# github override HOME, so here we are
|
|
|
ENV RUSTUP_HOME=/usr/local/rustup \
|
|
ENV RUSTUP_HOME=/usr/local/rustup \
|
|
@@ -23,14 +23,17 @@ ENV ANDROID_HOME /opt/android-sdk-linux
|
|
|
ENV JAVA_HOME /usr/lib/jvm/default
|
|
ENV JAVA_HOME /usr/lib/jvm/default
|
|
|
RUN mkdir ${ANDROID_HOME} && \
|
|
RUN mkdir ${ANDROID_HOME} && \
|
|
|
cd ${ANDROID_HOME} && \
|
|
cd ${ANDROID_HOME} && \
|
|
|
- wget -q https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip && \
|
|
|
|
|
- unzip -q sdk-tools-linux-4333796.zip && \
|
|
|
|
|
- rm sdk-tools-linux-4333796.zip && \
|
|
|
|
|
|
|
+ wget -q https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip && \
|
|
|
|
|
+ unzip -q commandlinetools-linux-13114758_latest.zip && \
|
|
|
|
|
+ rm commandlinetools-linux-13114758_latest.zip && \
|
|
|
|
|
+ mv cmdline-tools latest && \
|
|
|
|
|
+ mkdir cmdline-tools/ && \
|
|
|
|
|
+ mv latest cmdline-tools/ && \
|
|
|
chown -R root:root /opt
|
|
chown -R root:root /opt
|
|
|
RUN mkdir -p ~/.android && touch ~/.android/repositories.cfg
|
|
RUN mkdir -p ~/.android && touch ~/.android/repositories.cfg
|
|
|
-RUN yes | ${ANDROID_HOME}/tools/bin/sdkmanager "platform-tools" | grep -v = || true
|
|
|
|
|
-RUN yes | ${ANDROID_HOME}/tools/bin/sdkmanager "platforms;android-31" | grep -v = || true
|
|
|
|
|
-RUN yes | ${ANDROID_HOME}/tools/bin/sdkmanager "build-tools;31.0.0" | grep -v = || true
|
|
|
|
|
|
|
+RUN yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager "platform-tools" | grep -v = || true
|
|
|
|
|
+RUN yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager "platforms;android-36" | grep -v = || true
|
|
|
|
|
+RUN yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager "build-tools;36.0.0-rc5" | grep -v = || true
|
|
|
RUN ${ANDROID_HOME}/tools/bin/sdkmanager --update | grep -v = || true
|
|
RUN ${ANDROID_HOME}/tools/bin/sdkmanager --update | grep -v = || true
|
|
|
|
|
|
|
|
# Install Android NDK
|
|
# Install Android NDK
|
|
@@ -42,15 +45,16 @@ ENV NDK_HOME /usr/local/android-ndk-r25
|
|
|
|
|
|
|
|
# Copy contents to container. Should only use this on a clean directory
|
|
# Copy contents to container. Should only use this on a clean directory
|
|
|
WORKDIR /root/
|
|
WORKDIR /root/
|
|
|
-RUN git clone https://github.com/not-fl3/cargo-quad-apk cargo-apk
|
|
|
|
|
|
|
+RUN git clone https://github.com/narodnik/cargo-quad-apk cargo-apk
|
|
|
|
|
+#RUN git clone https://github.com/not-fl3/cargo-quad-apk cargo-apk
|
|
|
# For deterministic builds, we want a deterministic toolchain
|
|
# For deterministic builds, we want a deterministic toolchain
|
|
|
-RUN cd /root/cargo-apk && git checkout f3b865610b79a2b1b9d2b90600c36390a9e19569
|
|
|
|
|
|
|
+#RUN cd /root/cargo-apk && git checkout f3b865610b79a2b1b9d2b90600c36390a9e19569
|
|
|
|
|
|
|
|
# Install binary
|
|
# Install binary
|
|
|
RUN cargo install --path /root/cargo-apk
|
|
RUN cargo install --path /root/cargo-apk
|
|
|
|
|
|
|
|
# Add build-tools to PATH, for apksigner
|
|
# Add build-tools to PATH, for apksigner
|
|
|
-ENV PATH="/opt/android-sdk-linux/build-tools/31.0.0/:${PATH}"
|
|
|
|
|
|
|
+ENV PATH="/opt/android-sdk-linux/build-tools/36.0.0-rc5/:${PATH}"
|
|
|
|
|
|
|
|
# Lets cache packages for faster builds
|
|
# Lets cache packages for faster builds
|
|
|
RUN git clone --depth=1 https://codeberg.org/darkrenaissance/darkfi
|
|
RUN git clone --depth=1 https://codeberg.org/darkrenaissance/darkfi
|