Merge branch 'dev'

Author: SirRGB

.gitignore

@@ -1,6 +1,10 @@
-# Python
+# Python Virtual Environments
 venv
 .venv
+py-utils/__pycache__/
 
-# Env
+# Environment files
 *.env
+
+# IntelliJ
+.idea

Dockerfile

@@ -1,100 +1,31 @@
-FROM docker.io/debian:trixie-slim
+FROM docker.io/sirrgb/dockdroid-base:latest
 
 # User
 ARG userid=1000
 ARG groupid=1000
-ARG username=droid
-ENV USER="${username}"
 
-# Dirs
+# Directories
 ARG ROOT_DIR=/droid_workdir
 ENV SCRIPT_DIR="${ROOT_DIR}"/scripts
-ENV ROM_DIR="${ROOT_DIR}"/src/Los15
+ENV ROM_DIR=''
 ENV KEYS_DIR="${ROOT_DIR}"/keys
-ENV BIN_DIR="${ROOT_DIR}"/bin
 ENV LOGS_DIR="${ROOT_DIR}"/logs
 
-# Switch to Root for Setup
 USER root
 
-# Android build dependencies
-RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-    bc \
-    bison \
-    build-essential \
-    ca-certificates \
-    ccache \
-    curl \
-    flex \
-    g++-multilib \
-    gcc-multilib \
-    git \
-    git-lfs \
-    gnupg \
-    gperf \
-    imagemagick \
-    lib32readline-dev \
-    lib32z1-dev \
-    libelf-dev \
-    libncurses6 \
-    libsdl1.2-dev \
-    libssl-dev \
-    libxml2 \
-    libxml2-utils \
-    lz4 \
-    lzop \
-    pngcrush \
-    python3 \
-    python-is-python3 \
-    rsync \
-    schedtool \
-    ssh \
-    squashfs-tools \
-    xsltproc \
-    zip \
-    zlib1g-dev \
-# Python
-    libbz2-dev \
-    liblzma-dev \
-    libsqlite3-dev \
-    libreadline-dev \
-# Automation
-    file \
-    jq \
-    unzip
-
-RUN rm --recursive /var/lib/apt/lists /var/cache/apt/archives
-
-# Symlink libncurses for compatibility
-RUN ln -s /usr/lib/x86_64-linux-gnu/libncurses.so.6 /usr/lib/x86_64-linux-gnu/libncurses.so.5
-RUN ln -s /usr/lib/x86_64-linux-gnu/libtinfo.so.6 /usr/lib/x86_64-linux-gnu/libtinfo.so.5
-
 # Create dirs and copy scripts
-RUN mkdir -p "${SCRIPT_DIR}" "${BIN_DIR}" "${KEYS_DIR}"
+RUN mkdir --parents "${SCRIPT_DIR}"
 COPY scripts/ "${SCRIPT_DIR}"/
+COPY py-utils/ "${BIN_DIR}"/
 
 # Set up user and work directories
-RUN groupadd -g "${groupid}" "${username}" \
-   && useradd -m -s /bin/bash -u "${userid}" -g "${groupid}" "${username}" -d "${ROOT_DIR}"
-RUN chown -R "${userid}":"${groupid}" "${ROOT_DIR}" && chmod -R ug+srw "${ROOT_DIR}"
+RUN chown --recursive "${userid}":"${groupid}" "${ROOT_DIR}" && chmod --recursive u+srw "${ROOT_DIR}"
 
 # Switch to user for execution
-USER "${username}"
-
-# Install and verify repo
-RUN gpg --recv-key 8BB9AD793E8E6153AF0F9A4416530D5E920F5C65
-RUN curl -o "${BIN_DIR}"/repo https://storage.googleapis.com/git-repo-downloads/repo
-RUN curl https://storage.googleapis.com/git-repo-downloads/repo.asc | gpg --verify - "${BIN_DIR}"/repo
-
-# Provide make_key to create signing keys
-RUN curl https://raw.githubusercontent.com/LineageOS/android_development/refs/heads/lineage-23.0/tools/make_key > "${BIN_DIR}"/make_key
-
-# Patch for longer key size and drop input
-RUN sed -i "/read -p \"Enter password for '\$1' (blank for none\; password will be visible): \" \\\/d" "${BIN_DIR}"/make_key
-RUN sed -i "s/  password/password=\"\"/g; s/echo; exit 1' EXIT INT QUIT/' EXIT/g; s/2048/4096/g" "${BIN_DIR}"/make_key
+USER "${USER}"
 
 # Make scripts executable
-RUN chmod -R 500 "${BIN_DIR}" "${SCRIPT_DIR}"
+RUN chmod --recursive 500 "${SCRIPT_DIR}" "${BIN_DIR}"
 
 # ROM variables
 ENV LOCAL_MANIFEST=''
@@ -110,19 +41,25 @@ ENV LUNCH_PREFIX_FALLBACK=''
 ENV ROM_PREFIX_FALLBACK=''
 ENV ROM_VERSION_FALLBACK=''
 ENV ROM_OTA_BRANCH_FALLBACK=''
+ENV RELEASETOOL_EXTRA_FLAGS=''
 
 # Extra variables
 ENV CCACHE_SIZE=40
 ENV OTA_REPO_URL=''
 ENV KEYS_SUBJECT='/C=US/ST=California/L=Mountain View/O=Android/OU=Android/CN=Android/[email protected]'
-ENV TIME_ZONE="UTC"
+ENV TIME_ZONE='UTC'
 ENV REPOPICK_PICKS=''
 ENV REPOPICK_TOPICS=''
+ENV REPOPICK_PULLS=''
+ENV DEBUG=''
 
 # Authentification
 ENV TELEGRAM_TOKEN=''
 ENV GITHUB_TOKEN=''
 ENV SF_USER=''
 ENV SF_RELEASES_REPO=''
+ENV SSH_USER=''
+ENV SSH_UPLOAD_URL=''
+ENV SSH_DOWNLOAD_URL=''
 
 ENTRYPOINT ["/bin/bash", "-c", "${SCRIPT_DIR}/init.sh"]

README.md

@@ -45,23 +45,23 @@ Then we need to chown that directory to the Docker user:
 
 #### Debian/Ubuntu
 ```
-sudo chown -R 100999:"${UID}" ~/docker_droid/src ~/docker_droid/dotfiles ~/docker_droid/ccache ~/docker_droid/logs ~/docker_droid/keys
+sudo chown --recursive 100999:"${UID}" ~/docker_droid/src ~/docker_droid/dotfiles ~/docker_droid/ccache ~/docker_droid/logs ~/docker_droid/keys
 ```
 
 #### Fedora
 ```
-sudo chown -R 52587:"${UID}" ~/docker_droid/src ~/docker_droid/dotfiles ~/docker_droid/ccache ~/docker_droid/logs ~/docker_droid/keys
+sudo chown --recursive 52587:"${UID}" ~/docker_droid/src ~/docker_droid/dotfiles ~/docker_droid/ccache ~/docker_droid/logs ~/docker_droid/keys
 ```
 
 #### Other
 (If you know a smarter way to do this please tell me,  
-I know the available subuids can be found with `cat /etc/subuid | grep $USER | cut -d":" -f2`  
+I know the available subuids can be found with `grep $USER < /etc/subuid | cut --delimiter=":" --fields=2`  
 I just do not know if the container uid is predictable,  
 it seems to be 1000 for debian/ubuntu and 100 for fedora)
 
 Let other users read the directory
 ```
-sudo chmod -R 507 ~/docker_droid/src ~/docker_droid/dotfiles ~/docker_droid/ccache ~/docker_droid/logs ~/docker_droid/keys
+sudo chmod --recursive 507 ~/docker_droid/src ~/docker_droid/dotfiles ~/docker_droid/ccache ~/docker_droid/logs ~/docker_droid/keys
 ```
 Run the first docker build
 ```
@@ -75,7 +75,7 @@ ls -n ~/docker_droid/src/Los15/.repo
 Give ownership to the uid you found out:  
 (replace the 1st UID)
 ```
-sudo chown -R UID:"${UID}" ~/docker_droid/src ~/docker_droid/dotfiles ~/docker_droid/ccache ~/docker_droid/logs ~/docker_droid/keys
+sudo chown --recursive UID:"${UID}" ~/docker_droid/src ~/docker_droid/dotfiles ~/docker_droid/ccache ~/docker_droid/logs ~/docker_droid/keys
 ```
 And remove the incomplete sync
 ```
@@ -100,7 +100,7 @@ or
 These variables should be defined in the target.env.
 
 ```
-cp example.env target.env
+cp ~/docker_droid/minideb/example.env ~/docker_droid/minideb/target.env
 ```
 
 ```
@@ -153,6 +153,7 @@ [email protected]:user/ota_config
 ```
 podman compose up --force-recreate --build
 ```
+or
 ```
 docker compose up --force-recreate --build
 ```

TODO.md

@@ -1,6 +1,2 @@
 ## ToDo
-- move printing to printf
-  - 94fa96faf062de55062bb79909548e778b692bfb
-- automatic repo pulling for officially supported lineage devices
-- move json and xml handling to python
-- general ssh upload
+- make vendor pulling work for multiple devices

base/Dockerfile

@@ -0,0 +1,104 @@
+FROM docker.io/debian:trixie-slim
+
+# User
+ARG userid=1000
+ARG groupid=1000
+ENV USER=droid
+
+# Switch to Root for Setup
+USER root
+
+# Directories
+ARG ROOT_DIR=/droid_workdir
+ENV BIN_DIR="${ROOT_DIR}"/bin
+
+# Android build dependencies
+RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq && DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \
+    bc \
+    bison \
+    build-essential \
+    ca-certificates \
+    ccache \
+    curl \
+    flex \
+    g++-multilib \
+    gcc-multilib \
+    git \
+    git-lfs \
+    gnupg \
+    gperf \
+    imagemagick \
+    lib32readline-dev \
+    lib32z1-dev \
+    libelf-dev \
+    libncurses6 \
+    libsdl1.2-dev \
+    libssl-dev \
+    libxml2 \
+    libxml2-utils \
+    lz4 \
+    lzop \
+    pngcrush \
+    python3 \
+    python-is-python3 \
+    rsync \
+    schedtool \
+    ssh \
+    squashfs-tools \
+    xsltproc \
+    zip \
+    zlib1g-dev \
+# Python
+    libbz2-dev \
+    liblzma-dev \
+    libsqlite3-dev \
+    libreadline-dev \
+# Automation
+    file \
+    unzip
+
+RUN rm --recursive /var/lib/apt/lists /var/cache/apt/archives
+
+# Symlink libncurses for compatibility
+RUN ln --symbolic /usr/lib/x86_64-linux-gnu/libncurses.so.6 /usr/lib/x86_64-linux-gnu/libncurses.so.5
+RUN ln --symbolic /usr/lib/x86_64-linux-gnu/libtinfo.so.6 /usr/lib/x86_64-linux-gnu/libtinfo.so.5
+
+# Create dirs and copy scripts
+RUN mkdir --parents "${BIN_DIR}"
+
+# Set up user and work directories
+RUN groupadd --gid "${groupid}" "${USER}" \
+   && useradd --create-home --shell /bin/bash --uid "${userid}" --gid "${groupid}" "${USER}" --home-dir "${ROOT_DIR}"
+RUN chown --recursive "${userid}":"${groupid}" "${ROOT_DIR}" && chmod --recursive u+srw "${ROOT_DIR}"
+
+# Switch to user for execution
+USER "${USER}"
+
+# Curl flags
+RUN echo '/usr/bin/curl --fail --silent --show-error --location "$@"' > "${BIN_DIR}"/curl_cmd
+
+# Make scripts executable
+RUN chmod --recursive 700 "${BIN_DIR}"
+ENV PYENV_ROOT="${ROOT_DIR}"/pyenv-master
+ENV PATH="${PYENV_ROOT}"/bin:"${BIN_DIR}":"${PATH}"
+
+# Install and verify repo
+RUN gpg --recv-key 8BB9AD793E8E6153AF0F9A4416530D5E920F5C65
+RUN curl_cmd https://storage.googleapis.com/git-repo-downloads/repo --output "${BIN_DIR}"/repo
+RUN curl_cmd https://storage.googleapis.com/git-repo-downloads/repo.asc | gpg --verify - "${BIN_DIR}"/repo
+
+# Provide make_key to create signing keys
+RUN curl_cmd https://raw.githubusercontent.com/LineageOS/android_development/refs/heads/lineage-23.2/tools/make_key --output "${BIN_DIR}"/make_key
+
+# Patch for longer key size and drop input
+RUN sed --in-place "/read -p \"Enter password for '\$1' (blank for none\; password will be visible): \" \\\/d" "${BIN_DIR}"/make_key
+RUN sed --in-place "s/  password/password=\"\"/g; s/echo; exit 1' EXIT INT QUIT/' EXIT/g; s/2048/4096/g" "${BIN_DIR}"/make_key
+
+# Make scripts executable
+RUN chmod --recursive 500 "${BIN_DIR}"
+
+# PyEnv
+RUN curl_cmd --remote-name https://github.com/pyenv/pyenv/archive/refs/heads/master.zip --output-dir /tmp
+RUN unzip /tmp/master.zip -d "${ROOT_DIR}"/
+RUN rm /tmp/*
+RUN pyenv install 2 3.11

base/Makefile

@@ -0,0 +1,13 @@
+all: build run
+tag ?= $$(date +%Y%m%d%H%M)
+
+build:
+	docker build . --tag docker.io/sirrgb/dockdroid-base:latest
+
+run:
+	docker run --interactive --tty docker.io/sirrgb/dockdroid-base:latest
+
+publish:
+	docker tag docker.io/sirrgb/dockdroid-base:latest docker.io/sirrgb/dockdroid-base:$(tag)
+	docker image push docker.io/sirrgb/dockdroid-base:$(tag)
+	docker image push docker.io/sirrgb/dockdroid-base:latest

compose.yml

@@ -18,6 +18,6 @@ services:
       - ~/docker_droid/dotfiles/.ssh:/droid_workdir/.ssh:ro
     env_file:
       - path: ./target.env
-        required: false
+        required: true
       - path: ./config.env
         required: false

py-utils/json_arg_parser.py

@@ -0,0 +1,23 @@
+#!/usr/bin/python3
+
+import json
+import sys
+
+
+def main() -> None:
+    try:
+        json_target = json.loads(str(sys.stdin.read()))
+        search_target = str(sys.argv[1])
+    except TypeError:
+        print("Invalid arguments")
+        sys.exit(1)
+
+    try:
+        print(json_target[search_target])
+    except KeyError:
+        print("Argument not found")
+        sys.exit(1)
+
+
+if __name__ == '__main__':
+    main()