Actually use user-entrypoint self installer

PhasecoreX · Jan 12, 2024 · 4922769 · 4922769
1 parent 673a274
commit 4922769
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 109 deletions.
diff --git a/.github/workflows/build_alpine.yml b/.github/workflows/build_alpine.yml
@@ -6,14 +6,14 @@ on:
       - master
     paths:
       - user-entrypoint.sh
-      - Dockerfile.alpine
+      - Dockerfile
       - .github/workflows/build_alpine.yml
   pull_request:
     branches:
       - master
     paths:
       - user-entrypoint.sh
-      - Dockerfile.alpine
+      - Dockerfile
       - .github/workflows/build_alpine.yml
   repository_dispatch:
     types:
@@ -30,7 +30,6 @@ jobs:
       matrix:
         include:
           - base-image: alpine:edge
-            dockerfile: Dockerfile.alpine
             platforms: |-
               linux/amd64
               linux/arm/v6
@@ -44,7 +43,6 @@ jobs:
               docker.io/phasecorex/user-alpine:edge
             cache-from: ghcr.io/phasecorex/user-alpine:edge
           - base-image: alpine:3.19
-            dockerfile: Dockerfile.alpine
             platforms: |-
               linux/amd64
               linux/arm/v6
@@ -60,7 +58,6 @@ jobs:
               docker.io/phasecorex/user-alpine:latest
             cache-from: ghcr.io/phasecorex/user-alpine:3.19
           - base-image: alpine:3.18
-            dockerfile: Dockerfile.alpine
             platforms: |-
               linux/amd64
               linux/arm/v6
@@ -74,7 +71,6 @@ jobs:
               docker.io/phasecorex/user-alpine:3.18
             cache-from: ghcr.io/phasecorex/user-alpine:3.18
           - base-image: alpine:3.17
-            dockerfile: Dockerfile.alpine
             platforms: |-
               linux/amd64
               linux/arm/v6
@@ -88,7 +84,6 @@ jobs:
               docker.io/phasecorex/user-alpine:3.17
             cache-from: ghcr.io/phasecorex/user-alpine:3.17
           - base-image: alpine:3.16
-            dockerfile: Dockerfile.alpine
             platforms: |-
               linux/amd64
               linux/arm/v6

diff --git a/.github/workflows/build_debian.yml b/.github/workflows/build_debian.yml
@@ -6,17 +6,15 @@ on:
       - master
     paths:
       - user-entrypoint.sh
-      - Dockerfile.debian
+      - Dockerfile
       - .github/workflows/build_debian.yml
-      - su-exec/**
   pull_request:
     branches:
       - master
     paths:
       - user-entrypoint.sh
-      - Dockerfile.debian
+      - Dockerfile
       - .github/workflows/build_debian.yml
-      - su-exec/**
   repository_dispatch:
     types:
       - debian_image_update
@@ -32,7 +30,6 @@ jobs:
       matrix:
         include:
           - base-image: debian:12
-            dockerfile: Dockerfile.debian
             platforms: |-
               linux/amd64
               linux/arm/v7
@@ -49,7 +46,6 @@ jobs:
               docker.io/phasecorex/user-debian:latest
             cache-from: ghcr.io/phasecorex/user-debian:12
           - base-image: debian:12-slim
-            dockerfile: Dockerfile.debian
             platforms: |-
               linux/amd64
               linux/arm/v7
@@ -64,7 +60,6 @@ jobs:
               docker.io/phasecorex/user-debian:bookworm-slim
             cache-from: ghcr.io/phasecorex/user-debian:12-slim
           - base-image: debian:11
-            dockerfile: Dockerfile.debian
             platforms: |-
               linux/amd64
               linux/arm/v7
@@ -79,7 +74,6 @@ jobs:
               docker.io/phasecorex/user-debian:bullseye
             cache-from: ghcr.io/phasecorex/user-debian:11
           - base-image: debian:11-slim
-            dockerfile: Dockerfile.debian
             platforms: |-
               linux/amd64
               linux/arm/v7
@@ -94,7 +88,6 @@ jobs:
               docker.io/phasecorex/user-debian:bullseye-slim
             cache-from: ghcr.io/phasecorex/user-debian:11-slim
           - base-image: debian:10
-            dockerfile: Dockerfile.debian
             platforms: |-
               linux/amd64
               linux/arm/v7
@@ -107,7 +100,6 @@ jobs:
               docker.io/phasecorex/user-debian:buster
             cache-from: ghcr.io/phasecorex/user-debian:10
           - base-image: debian:10-slim
-            dockerfile: Dockerfile.debian
             platforms: |-
               linux/amd64
               linux/arm/v7
@@ -122,8 +114,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          submodules: recursive
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5

diff --git a/.github/workflows/build_python.yml b/.github/workflows/build_python.yml
@@ -6,19 +6,15 @@ on:
       - master
     paths:
       - user-entrypoint.sh
-      - Dockerfile.alpine
-      - Dockerfile.debian
+      - Dockerfile
       - .github/workflows/build_python.yml
-      - su-exec/**
   pull_request:
     branches:
       - master
     paths:
       - user-entrypoint.sh
-      - Dockerfile.alpine
-      - Dockerfile.debian
+      - Dockerfile
       - .github/workflows/build_python.yml
-      - su-exec/**
   repository_dispatch:
     types:
       - python_image_update
@@ -34,7 +30,6 @@ jobs:
       matrix:
         include:
           - base-image: python:3.12
-            dockerfile: Dockerfile.debian
             platforms: |-
               linux/amd64
               linux/arm/v7
@@ -51,7 +46,6 @@ jobs:
               docker.io/phasecorex/user-python:latest
             cache-from: ghcr.io/phasecorex/user-python:3.12
           - base-image: python:3.12-slim
-            dockerfile: Dockerfile.debian
             platforms: |-
               linux/amd64
               linux/arm/v7
@@ -66,7 +60,6 @@ jobs:
               docker.io/phasecorex/user-python:3-slim
             cache-from: ghcr.io/phasecorex/user-python:3.12-slim
           - base-image: python:3.12-alpine
-            dockerfile: Dockerfile.alpine
             platforms: |-
               linux/amd64
               linux/arm/v6
@@ -82,7 +75,6 @@ jobs:
               docker.io/phasecorex/user-python:3-alpine
             cache-from: ghcr.io/phasecorex/user-python:3.12-alpine
           - base-image: python:3.11
-            dockerfile: Dockerfile.debian
             platforms: |-
               linux/amd64
               linux/arm/v7
@@ -95,7 +87,6 @@ jobs:
               docker.io/phasecorex/user-python:3.11
             cache-from: ghcr.io/phasecorex/user-python:3.11
           - base-image: python:3.11-slim
-            dockerfile: Dockerfile.debian
             platforms: |-
               linux/amd64
               linux/arm/v7
@@ -108,7 +99,6 @@ jobs:
               docker.io/phasecorex/user-python:3.11-slim
             cache-from: ghcr.io/phasecorex/user-python:3.11-slim
           - base-image: python:3.11-alpine
-            dockerfile: Dockerfile.alpine
             platforms: |-
               linux/amd64
               linux/arm/v6
@@ -122,7 +112,6 @@ jobs:
               docker.io/phasecorex/user-python:3.11-alpine
             cache-from: ghcr.io/phasecorex/user-python:3.11-alpine
           - base-image: python:3.10
-            dockerfile: Dockerfile.debian
             platforms: |-
               linux/amd64
               linux/arm/v7
@@ -135,7 +124,6 @@ jobs:
               docker.io/phasecorex/user-python:3.10
             cache-from: ghcr.io/phasecorex/user-python:3.10
           - base-image: python:3.10-slim
-            dockerfile: Dockerfile.debian
             platforms: |-
               linux/amd64
               linux/arm/v7
@@ -148,7 +136,6 @@ jobs:
               docker.io/phasecorex/user-python:3.10-slim
             cache-from: ghcr.io/phasecorex/user-python:3.10-slim
           - base-image: python:3.10-alpine
-            dockerfile: Dockerfile.alpine
             platforms: |-
               linux/amd64
               linux/arm/v6
@@ -162,7 +149,6 @@ jobs:
               docker.io/phasecorex/user-python:3.10-alpine
             cache-from: ghcr.io/phasecorex/user-python:3.10-alpine
           - base-image: python:3.9
-            dockerfile: Dockerfile.debian
             platforms: |-
               linux/amd64
               linux/arm/v7
@@ -175,7 +161,6 @@ jobs:
               docker.io/phasecorex/user-python:3.9
             cache-from: ghcr.io/phasecorex/user-python:3.9
           - base-image: python:3.9-slim
-            dockerfile: Dockerfile.debian
             platforms: |-
               linux/amd64
               linux/arm/v7
@@ -188,7 +173,6 @@ jobs:
               docker.io/phasecorex/user-python:3.9-slim
             cache-from: ghcr.io/phasecorex/user-python:3.9-slim
           - base-image: python:3.9-alpine
-            dockerfile: Dockerfile.alpine
             platforms: |-
               linux/amd64
               linux/arm/v6
@@ -202,7 +186,6 @@ jobs:
               docker.io/phasecorex/user-python:3.9-alpine
             cache-from: ghcr.io/phasecorex/user-python:3.9-alpine
           - base-image: python:3.8
-            dockerfile: Dockerfile.debian
             platforms: |-
               linux/amd64
               linux/arm/v7
@@ -215,7 +198,6 @@ jobs:
               docker.io/phasecorex/user-python:3.8
             cache-from: ghcr.io/phasecorex/user-python:3.8
           - base-image: python:3.8-slim
-            dockerfile: Dockerfile.debian
             platforms: |-
               linux/amd64
               linux/arm/v7
@@ -228,7 +210,6 @@ jobs:
               docker.io/phasecorex/user-python:3.8-slim
             cache-from: ghcr.io/phasecorex/user-python:3.8-slim
           - base-image: python:3.8-alpine
-            dockerfile: Dockerfile.alpine
             platforms: |-
               linux/amd64
               linux/arm/v6
@@ -244,8 +225,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          submodules: recursive
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5

diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml
@@ -6,17 +6,15 @@ on:
       - master
     paths:
       - user-entrypoint.sh
-      - Dockerfile.debian
+      - Dockerfile
       - .github/workflows/build_ubuntu.yml
-      - su-exec/**
   pull_request:
     branches:
       - master
     paths:
       - user-entrypoint.sh
-      - Dockerfile.debian
+      - Dockerfile
       - .github/workflows/build_ubuntu.yml
-      - su-exec/**
   repository_dispatch:
     types:
       - ubuntu_image_update
@@ -32,7 +30,6 @@ jobs:
       matrix:
         include:
           - base-image: ubuntu:20.04
-            dockerfile: Dockerfile.debian
             platforms: |-
               linux/amd64
               linux/arm/v7
@@ -46,7 +43,6 @@ jobs:
               docker.io/phasecorex/user-ubuntu:focal
             cache-from: ghcr.io/phasecorex/user-ubuntu:20.04
           - base-image: ubuntu:22.04
-            dockerfile: Dockerfile.debian
             platforms: |-
               linux/amd64
               linux/arm/v7
@@ -62,7 +58,6 @@ jobs:
               docker.io/phasecorex/user-ubuntu:latest
             cache-from: ghcr.io/phasecorex/user-ubuntu:22.04
           - base-image: ubuntu:24.04
-            dockerfile: Dockerfile.debian
             platforms: |-
               linux/amd64
               linux/arm/v7
@@ -78,8 +73,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          submodules: recursive
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5

diff --git a/.gitmodules b/.gitmodules
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
diff --git a/Dockerfile.debian b/Dockerfile.debian
diff --git a/su-exec b/su-exec