Save artifact apks to the docker image

jptomoya · Dec 3, 2023 · 1de25bc · 1de25bc
1 parent afe208f
commit 1de25bc
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -22,9 +22,12 @@ RUN abuild-keygen -a -i -n \
 
 FROM alpine:${ALPINE_VERSION}
 COPY --from=builder --chown=root:root /home/packager/.abuild/*.pub /etc/apk/keys
-COPY --from=builder --chown=root:root /home/packager/packages /root/packages
-RUN CHROMIUM_APK=$(find /root/packages/community/x86_64/ -name 'chromium-*.apk' -type f | sort -n | head -n 1) \
+WORKDIR /opt/packages
+COPY --from=builder --chown=root:root /home/packager/packages .
+RUN CHROMIUM_APK=$(find ./community/x86_64/ -name 'chromium-*.apk' -type f | sort -n | head -n 1) \
+  && [ -n "$CHROMIUM_APK" ] \
   && apk add --no-cache "${CHROMIUM_APK}" font-noto-cjk \
-  && rm -rf /root/packages \
   && adduser -D user
+
+WORKDIR /
 USER user
diff --git a/Dockerfile.wsnapshot b/Dockerfile.wsnapshot
@@ -43,9 +43,12 @@ RUN abuild-keygen -a -i -n \
 
 FROM alpine:${ALPINE_VERSION}
 COPY --from=builder --chown=root:root /home/packager/.abuild/*.pub /etc/apk/keys
-COPY --from=builder --chown=root:root /home/packager/packages /root/packages
-RUN CHROMIUM_APK=$(find /root/packages/community/x86_64/ -name 'chromium-*.apk' -type f | sort -n | head -n 1) \
+WORKDIR /opt/packages
+COPY --from=builder --chown=root:root /home/packager/packages .
+RUN CHROMIUM_APK=$(find ./community/x86_64/ -name 'chromium-*.apk' -type f | sort -n | head -n 1) \
+  && [ -n "$CHROMIUM_APK" ] \
   && apk add --no-cache "${CHROMIUM_APK}" font-noto-cjk \
-  && rm -rf /root/packages \
   && adduser -D user
+
+WORKDIR /
 USER user
diff --git a/README.md b/README.md
@@ -40,9 +40,19 @@ docker run -d --rm -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=$DISPLAY \
   --cap-add SYS_ADMIN abuild-chromium chromium --disable-gpu --disable-dev-shm-usage --no-first-run
 ```
 
-* the SYS_ADMIN capability required to run Chromium.
+* the `SYS_ADMIN` capability required to run Chromium.
 * Use `--disable-dev-shm-usage` because Docker's /dev/shm is usually too small.
 
+## Extracting apk and public key
+To extract the built Chromium apk and the corresponding public key for installation on other Alpine Linux environments, follow these steps:
+
+```
+$ container_id=$(docker run --rm -d abuild-chromium tail -f /dev/null)
+$ docker cp $container_id:/opt/packages .
+$ docker cp $container_id:/etc/apk/keys/ .
+$ docker kill $container_id
+```
+
 ![image](https://github.com/jptomoya/abuild-chromium/assets/4786564/c8d6cb68-7dd1-4481-a04c-b6b26c53e433)
 
 ## References