try with tini

Amateur-God · Jun 28, 2024 · 33a5190 · 33a5190
1 parent 6490c58
commit 33a5190
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 73 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -470,77 +470,6 @@
               echo "Cache directory /tmp/.docker-cache-new does not exist"
             fi
 
-
-    create_and_push_manifest_main:
-      name: Create and Push Docker Manifest (main)
-      needs:
-        - build_main_or_pr
-      runs-on: ubuntu-latest
-      steps:
-        - name: Log in to DockerHub
-          uses: docker/login-action@v2
-          with:
-            username: ${{ secrets.DOCKER_USERNAME }}
-            password: ${{ secrets.DOCKER_PASSWORD }}
-        - name: Pull Docker Images
-          run: |
-            docker pull docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_main_or_pr.outputs.slug_lower }}:${{ needs.build_main_or_pr.outputs.version }}-amd64
-            docker pull docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_main_or_pr.outputs.slug_lower }}:${{ needs.build_main_or_pr.outputs.version }}-arm64
-            docker pull docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_main_or_pr.outputs.slug_lower }}:${{ needs.build_main_or_pr.outputs.version }}-armv7
-            docker pull docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_main_or_pr.outputs.slug_lower }}:${{ needs.build_main_or_pr.outputs.version }}-i386
-            docker pull docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_main_or_pr.outputs.slug_lower }}:latest-amd64
-            docker pull docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_main_or_pr.outputs.slug_lower }}:latest-arm64
-            docker pull docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_main_or_pr.outputs.slug_lower }}:latest-armv7
-            docker pull docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_main_or_pr.outputs.slug_lower }}:latest-i386
-        - name: Create and Push Docker Manifest latest
-          run: |
-            docker buildx imagetools create --tag docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_main_or_pr.outputs.slug_lower }}:latest \
-              --append docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_main_or_pr.outputs.slug_lower }}:latest-amd64 \
-              --append docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_main_or_pr.outputs.slug_lower }}:latest-arm64 \
-              --append docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_main_or_pr.outputs.slug_lower }}:latest-armv7 \
-              --append docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_main_or_pr.outputs.slug_lower }}:latest-i386
-            docker buildx imagetools push docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_main_or_pr.outputs.slug_lower }}:latest
-          env:
-            DOCKER_CLI_EXPERIMENTAL: enabled
-        - name: Create and Push Docker Manifest version
-          run: |
-            docker buildx imagetools create --tag docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_main_or_pr.outputs.slug_lower }}:${{ needs.build_main_or_pr.outputs.version }} \
-              --append docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_main_or_pr.outputs.slug_lower }}:${{ needs.build_main_or_pr.outputs.version }}-amd64 \
-              --append docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_main_or_pr.outputs.slug_lower }}:${{ needs.build_main_or_pr.outputs.version }}-arm64 \
-              --append docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_main_or_pr.outputs.slug_lower }}:${{ needs.build_main_or_pr.outputs.version }}-armv7 \
-              --append docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_main_or_pr.outputs.slug_lower }}:${{ needs.build_main_or_pr.outputs.version }}-i386
-            docker buildx imagetools push docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_main_or_pr.outputs.slug_lower }}:${{ needs.build_main_or_pr.outputs.version }}
-          env:
-            DOCKER_CLI_EXPERIMENTAL: enabled
-
-    create_and_push_manifest_branch:
-      name: Create and Push Docker Manifest (branch)
-      needs:
-        - build_other_branches
-      runs-on: ubuntu-latest
-      steps:
-        - name: Log in to DockerHub
-          uses: docker/login-action@v2
-          with:
-            username: ${{ secrets.DOCKER_USERNAME }}
-            password: ${{ secrets.DOCKER_PASSWORD }}
-        - name: Pull Docker Images
-          run: |
-            docker pull docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_other_branches.outputs.slug_lower }}:${{ needs.build_other_branches.outputs.version }}-amd64
-            docker pull docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_other_branches.outputs.slug_lower }}:${{ needs.build_other_branches.outputs.version }}-arm64
-            docker pull docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_other_branches.outputs.slug_lower }}:${{ needs.build_other_branches.outputs.version }}-armv7
-            docker pull docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_other_branches.outputs.slug_lower }}:${{ needs.build_other_branches.outputs.version }}-i386
-        - name: Create and Push Docker Manifest
-          run: |
-            docker buildx imagetools create --tag docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_other_branches.outputs.slug_lower }}:${{ needs.build_other_branches.outputs.version }} \
-              --append docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_other_branches.outputs.slug_lower }}:${{ needs.build_other_branches.outputs.version }}-amd64 \
-              --append docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_other_branches.outputs.slug_lower }}:${{ needs.build_other_branches.outputs.version }}-arm64 \
-              --append docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_other_branches.outputs.slug_lower }}:${{ needs.build_other_branches.outputs.version }}-armv7 \
-              --append docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_other_branches.outputs.slug_lower }}:${{ needs.build_other_branches.outputs.version }}-i386
-            docker buildx imagetools push docker.io/${{ secrets.DOCKER_USERNAME }}/${{ needs.build_other_branches.outputs.slug_lower }}:${{ needs.build_other_branches.outputs.version }}
-          env:
-            DOCKER_CLI_EXPERIMENTAL: enabled
-
     update_config_main_or_pr:
       runs-on: ubuntu-latest
       needs: build_main_or_pr

diff --git a/addons/adb_server/Dockerfile b/addons/adb_server/Dockerfile
@@ -3,22 +3,29 @@ ARG BUILD_FROM
 # Use the appropriate base image depending on the target architecture
 FROM ${BUILD_FROM}
 
+# Install necessary packages and tini
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends android-tools-adb wget bash build-essential cmake git libjson-c-dev libwebsockets-dev dos2unix && \
+    apt-get install -y --no-install-recommends android-tools-adb wget bash build-essential cmake git libjson-c-dev libwebsockets-dev dos2unix tini && \
     rm -rf /var/lib/apt/lists/* && \
     git clone https://github.com/tsl0922/ttyd.git
+
+# Build ttyd
 WORKDIR /ttyd
 RUN mkdir build
 WORKDIR /ttyd/build
 RUN cmake .. && \
     make && make install
 
+# Copy and convert scripts
 COPY run.sh /run.sh
 COPY restricted-shell.sh /usr/local/bin/restricted-shell.sh
 COPY adb_connect.sh /usr/local/bin/adb_connect.sh
 RUN dos2unix /run.sh /usr/local/bin/restricted-shell.sh /usr/local/bin/adb_connect.sh
 RUN chmod +x /run.sh /usr/local/bin/restricted-shell.sh /usr/local/bin/adb_connect.sh
 
+# Expose necessary ports
 EXPOSE 5037 7681
 
-CMD ["/run.sh"]
+# Use tini as the init system
+ENTRYPOINT ["/usr/bin/tini", "--"]
+CMD ["/run.sh"]