Added support for PR builds on master (#3363)

* added support for PR builds on master

* add linefeed to .dockerignore

* single dockerfile

* fix dockerfile ref

* update for java 17 lts

.dockerignore

@@ -1 +1,3 @@
-*
+./docker
+./github
+*.md

.github/workflows/docker-beta.yml

@@ -0,0 +1,43 @@
+name: Build and push docker (beta)
+
+on:
+  pull_request:
+    branches: [master]
+    types: [closed]
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+
+  build_and_push:
+    name: Build and push
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v4
+      - name: Log in to the Container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Get hash
+        id: hash
+        run: echo "APKTOOL_HASH=$(echo $GITHUB_SHA | cut -c 1-6)" >> $GITHUB_ENV
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2        
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          platforms: linux/amd64
+          file: ./docker/Dockerfile
+          push: true
+          tags: |
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.APKTOOL_HASH }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:beta
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:master

.github/workflows/docker-release.yml

@@ -1,17 +1,9 @@
-name: Build and push docker
+name: Build and push docker (release)
 
 on:
   release:
     types: [published]
 
-# Use the below to integrate into a Beta build from master
-# Changes to the Dockerfile to use the manually built Jar
-# from the build automation would be required.
-# on:
-#   pull_request:
-#     branches: [master]
-#     types: [closed]
-
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
@@ -45,9 +37,10 @@ jobs:
         with:
           context: .
           platforms: linux/amd64
-          file: ./Dockerfile
+          file: ./docker/Dockerfile
           push: true
           tags: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.APKTOOL_HASH }}
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.APKTOOL_TAG }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:prod
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest

README.md

@@ -21,7 +21,7 @@ If you discover a security vulnerability within Apktool, please send an e-mail t
 - [Downloads Mirror](https://connortumbleson.com/apktool/)
 - [How to Build](https://ibotpeaches.github.io/Apktool/build/)
 - [Documentation](https://ibotpeaches.github.io/Apktool/documentation/)
-- [Use in Docker](./DOCKER.md)
+- [Use in Docker](./docker/README.md)
 - [Bug Reports](https://github.com/iBotPeaches/Apktool/issues)
 - [Changelog/Information](https://ibotpeaches.github.io/Apktool/changes/)
 - [XDA Post](https://forum.xda-developers.com/t/util-dec-2-2020-apktool-tool-for-reverse-engineering-apk-files.1755243/)

docker/Dockerfile

@@ -1,4 +1,21 @@
-FROM openjdk:21-slim
+# BUILDER
+# =====================================================
+FROM ibm-semeru-runtimes:open-17-jdk-jammy AS builder
+
+COPY . /build
+WORKDIR /build
+RUN \
+    # Apktool
+    ./gradlew build shadowJar proguard
+
+RUN \
+    # Relocate for easier copying
+    JAR=$(find /build/brut.apktool/apktool-cli/build/libs/apktool-*.jar |grep -v cli-all) &&\
+    mv ${JAR} /build/apktool.jar
+
+# BASE
+# =====================================================
+FROM ibm-semeru-runtimes:open-17-jre-jammy AS base
 
 # Latest version as of 2023.10.01
 # Ref: https://developer.android.com/studio/index.html#command-line-tools-only
@@ -6,18 +23,21 @@ ARG COMMAND_LINE_TOOLS_VERSION=10406996
 
 ARG ANDROID_SDK_ROOT=/opt/android-sdk
 
+COPY --from=builder /build/apktool.jar /usr/local/bin/apktool.jar
+COPY --from=builder /build/scripts/linux/apktool /usr/local/bin/apktool
+
 RUN \
     # Update
     apt-get update &&\
     \
-    # Apktool
+    # Apktool final setup
-    apt-get install --no-install-recommends -y curl zipalign &&\
-    curl -o /usr/local/bin/apktool https://raw.githubusercontent.com/iBotPeaches/Apktool/master/scripts/linux/apktool &&\
-    curl -L -o /usr/local/bin/apktool.jar $(curl -s https://api.github.com/repos/iBotPeaches/Apktool/releases/latest |grep browser_download_url |awk '{print $2}' |sed 's/"//g') &&\
     chmod +x /usr/local/bin/apktool /usr/local/bin/apktool.jar &&\
     \
     # Android SDK
     apt-get install -y --no-install-recommends \
+        ca-certificates \
+        curl \
+        zipalign \
         git \
         openssl \
         wget \