From 73f3e0aeb398d71a49f2a32225f00c6059fe4d97 Mon Sep 17 00:00:00 2001
From: Andri Joos <andri@joos.io>
Date: Sun, 17 Nov 2024 02:09:06 +0100
Subject: [PATCH] install aapt2
---
Dockerfile | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 90d4b8f..c4a137c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,28 +1,45 @@
ARG DEPENDENCY_DIR="/tmp/dependencies"
ARG BUNDLETOOL_DIR="bundletool"
ARG BUNDLETOOL_FILENAME="bundletool.jar"
+ARG BIN_DIR="/bin"
FROM ubuntu:24.04 AS download
ARG DEPENDENCY_DIR
ARG BUNDLETOOL_DIR
ARG BUNDLETOOL_FILENAME
+ARG BIN_DIR
+
+ARG TMP_DIR="/tmp"
+
ARG BUNDLETOOL_DIR="${DEPENDENCY_DIR}/${BUNDLETOOL_DIR}"
ARG BUNDLETOOL_FILE="${BUNDLETOOL_DIR}/${BUNDLETOOL_FILENAME}"
ARG BUNDLETOOL_VERSION="1.17.2"
+# https://maven.google.com/web/index.html?q=aap#com.android.tools.build:aapt2
+ARG AAPT2_VERSION="8.7.2-12006047"
+ARG BIN_DIR="${DEPENDENCY_DIR}${BIN_DIR}"
+ARG AAPT2_JAR="${TMP_DIR}/aapt2.jar"
+
RUN apt update \
- && apt install -y wget
+ && apt install -y wget unzip
RUN mkdir -p ${BUNDLETOOL_DIR} \
&& wget "https://github.com/google/bundletool/releases/download/${BUNDLETOOL_VERSION}/bundletool-all-${BUNDLETOOL_VERSION}.jar" -O ${BUNDLETOOL_FILE}
+RUN mkdir -p ${BIN_DIR} \
+ && wget https://dl.google.com/android/maven2/com/android/tools/build/aapt2/${AAPT2_VERSION}/aapt2-${AAPT2_VERSION}-linux.jar -O ${AAPT2_JAR} \
+ && unzip ${AAPT2_JAR} -d ${BIN_DIR}
+
+
FROM alpine:3
ARG DEPENDENCY_DIR
+
ARG USER_UID="1000"
ARG USER_GID=$USER_UID
ARG USERNAME="bundletool"
+ARG BIN_DIR
ARG BUNDLETOOL_DIR
ARG BUNDLETOOL_FILENAME
@@ -32,13 +49,14 @@ ARG BUNDLETOOL_BIN=/bin/bundletool
COPY --from=download ${DEPENDENCY_DIR} /
-RUN apk add --no-cache bash openjdk17-jdk \
+RUN apk add --no-cache bash openjdk17-jdk libgcc gcompat \
&& addgroup ${USERNAME} -g ${USER_GID} \
&& adduser ${USERNAME} --uid ${USER_UID} --ingroup ${USERNAME} --disabled-password \
&& echo -e '#!/bin/bash\njava -jar '"$BUNDLETOOL_FILE"' "$@"' > ${BUNDLETOOL_BIN} \
&& chmod +x ${BUNDLETOOL_BIN}
USER ${USERNAME}
+WORKDIR /home/${USERNAME}
# Test
# RUN bash /bin/bundletool --help && exit 1
--
GitLab