diff --git a/.github/workflows/build_alpine.yml b/.github/workflows/build_alpine.yml index 030367d..0637e96 100644 --- 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 index 6078b99..16336fd 100644 --- 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 index 9367b6e..a9ae55c 100644 --- 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 index 28d1067..0894175 100644 --- 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 deleted file mode 100644 index ff7f521..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "su-exec"] - path = su-exec - url = https://github.com/ncopa/su-exec.git diff --git a/Dockerfile.alpine b/Dockerfile.alpine deleted file mode 100644 index f800c2f..0000000 --- a/Dockerfile.alpine +++ /dev/null @@ -1,16 +0,0 @@ -ARG BASE_IMG -FROM ${BASE_IMG} - -RUN set -eux; \ - apk add --no-cache shadow su-exec tzdata; \ - groupadd --gid 1000 docker; \ - useradd --no-log-init --uid 1000 --gid 1000 --home-dir /config --shell /bin/false docker; \ - mkdir -p \ - /config \ - /data; - -COPY user-entrypoint.sh /bin/user-entrypoint - -ENTRYPOINT ["user-entrypoint"] - -CMD ["sh"] diff --git a/Dockerfile.debian b/Dockerfile.debian deleted file mode 100644 index 1dbf798..0000000 --- a/Dockerfile.debian +++ /dev/null @@ -1,38 +0,0 @@ -ARG BASE_IMG -FROM ${BASE_IMG} as builder - -COPY su-exec/ /su-exec/ - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends make gcc libc6-dev; \ - cd su-exec; \ - make su-exec - - - -FROM ${BASE_IMG} - -COPY --from=builder /su-exec/su-exec /bin/su-exec - -RUN set -eux; \ -# add user and group - groupadd --gid 1000 docker; \ - useradd --no-log-init --uid 1000 --gid 1000 --home-dir /config --shell /bin/false docker; \ - mkdir -p \ - /config \ - /data; \ -# add timezone functionality if missing - if [ ! -d /usr/share/zoneinfo ]; then \ - apt-get update; \ - apt-get install -y --no-install-recommends tzdata; \ - rm -rf /var/lib/apt/lists/*; \ - fi; \ -# make sure su-exec is working - su-exec docker true - -COPY user-entrypoint.sh /bin/user-entrypoint - -ENTRYPOINT ["user-entrypoint"] - -CMD ["bash"] diff --git a/su-exec b/su-exec deleted file mode 160000 index 212b751..0000000 --- a/su-exec +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 212b75144bbc06722fbd7661f651390dc47a43d1