fix(Dockerfile): root and rootless

srcdslab · Jul 19, 2023 · a622d02 · a622d02
1 parent 8376333
commit a622d02
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,10 +39,12 @@ jobs:
         include:
           - os: ubuntu-20.04
             context: python/3.10-slim
-            target: ""
+            target: root
+            suffix: ""
           - os: ubuntu-20.04
             context: python/3.10-slim
             target: rootless
+            suffix: -rootless
 
     permissions:
       contents: read
@@ -67,7 +69,7 @@ jobs:
           flavor: |
             latest=auto
             prefix=
-            suffix=${{ matrix.target != '' || format('-{0}', matrix.target)  }}
+            suffix=${{ matrix.suffix }}
 
       - name: Build Docker image
         uses: docker/[email protected]

diff --git a/python/3.10-slim/Dockerfile b/python/3.10-slim/Dockerfile
@@ -1,4 +1,5 @@
-FROM python:3.10-slim as base
+# syntax = docker/dockerfile:1.4
+FROM python:3.10-slim as root
 
 ARG SOURCEKNIGHT_VERSION
 
@@ -14,7 +15,7 @@ ENTRYPOINT ["/entrypoint.sh"]
 
 CMD ["--help"]
 
-FROM base as rootless
+FROM root as rootless
 RUN groupadd -g 1000 rootless && \
     useradd -r -u 1000 -g rootless rootless