switch centos to fedora (#42)

Signed-off-by: Caleb Lloyd <[email protected]>

Author: caleblloyd

README.md

@@ -49,7 +49,7 @@ RUN addgroup -g 1000 docker && \
 RUN addgroup --gid 1000 docker && \
     adduser --uid 1000 --ingroup docker --home /home/docker --shell /bin/sh --disabled-password --gecos "" docker
 
-# centos / fedora
+# fedora
 RUN groupadd -g 1000 docker && \
     useradd -u 1000 -g docker -d /home/docker -s /bin/sh docker
 ```

docker-compose.yml

@@ -5,9 +5,9 @@ services:
     build: ./docker/alpine
     image: "fixuid-alpine"
 
-  centos:
-    build: ./docker/centos
-    image: "fixuid-centos"
+  fedora:
+    build: ./docker/fedora
+    image: "fixuid-fedora"
 
   debian:
     build: ./docker/debian

docker/centos/Dockerfile docker/fedora/Dockerfiledocker/centos/Dockerfile renamed to docker/fedora/Dockerfile

@@ -1,4 +1,4 @@
-FROM centos:latest
+FROM fedora:latest
 
 RUN groupadd -g 1000 docker && \
     useradd -u 1000 -g docker -d /home/docker -s /bin/sh docker

test.sh

@@ -12,132 +12,132 @@ mv test-no-escalate/test-no-escalate docker/fs-stage/usr/local/bin
 
 rm -rf docker/alpine/stage
 cp -r docker/fs-stage docker/alpine/stage
-rm -rf docker/centos/stage
-cp -r docker/fs-stage docker/centos/stage
+rm -rf docker/fedora/stage
+cp -r docker/fs-stage docker/fedora/stage
 rm -rf docker/debian/stage
 cp -r docker/fs-stage docker/debian/stage
 
 docker compose build
 
 echo "\nalpine default user/group cmd"
 docker run --rm fixuid-alpine fixuid-test.sh docker docker
-echo "\ncentos default user/group cmd"
-docker run --rm fixuid-centos fixuid-test.sh docker docker
+echo "\nfedora default user/group cmd"
+docker run --rm fixuid-fedora fixuid-test.sh docker docker
 echo "\ndebian default user/group cmd"
 docker run --rm fixuid-debian fixuid-test.sh docker docker
 echo "\nalpine default user/group entrypoint"
 docker run --rm --entrypoint fixuid fixuid-alpine fixuid-test.sh docker docker
-echo "\ncentos default user/group entrypoint"
-docker run --rm --entrypoint fixuid fixuid-centos fixuid-test.sh docker docker
+echo "\nfedora default user/group entrypoint"
+docker run --rm --entrypoint fixuid fixuid-fedora fixuid-test.sh docker docker
 echo "\ndebian default user/group entrypoint"
 docker run --rm --entrypoint fixuid fixuid-debian fixuid-test.sh docker docker "docker users"
 
 echo "\nalpine 1001:1001 cmd"
 docker run --rm -u 1001:1001 fixuid-alpine fixuid-test.sh docker docker
-echo "\ncentos 1001:1001 cmd"
-docker run --rm -u 1001:1001 fixuid-centos fixuid-test.sh docker docker
+echo "\nfedora 1001:1001 cmd"
+docker run --rm -u 1001:1001 fixuid-fedora fixuid-test.sh docker docker
 echo "\ndebian 1001:1001 cmd"
 docker run --rm -u 1001:1001 fixuid-debian fixuid-test.sh docker docker
 echo "\nalpine 1001:1001 entrypoint"
 docker run --rm -u 1001:1001 --entrypoint fixuid fixuid-alpine fixuid-test.sh docker docker
-echo "\ncentos 1001:1001 entrypoint"
-docker run --rm -u 1001:1001 --entrypoint fixuid fixuid-centos fixuid-test.sh docker docker
+echo "\nfedora 1001:1001 entrypoint"
+docker run --rm -u 1001:1001 --entrypoint fixuid fixuid-fedora fixuid-test.sh docker docker
 echo "\ndebian 1001:1001 entrypoint"
 docker run --rm -u 1001:1001 --entrypoint fixuid fixuid-debian fixuid-test.sh docker docker "docker users"
 
 echo "\nalpine 0:0 cmd"
 docker run --rm -u 0:0 fixuid-alpine fixuid-test.sh root root
-echo "\ncentos 0:0 cmd"
-docker run --rm -u 0:0 fixuid-centos fixuid-test.sh root root
+echo "\nfedora 0:0 cmd"
+docker run --rm -u 0:0 fixuid-fedora fixuid-test.sh root root
 echo "\ndebian 0:0 cmd"
 docker run --rm -u 0:0 fixuid-debian fixuid-test.sh root root
 echo "\nalpine 0:0 entrypoint"
 docker run --rm -u 0:0 --entrypoint fixuid fixuid-alpine fixuid-test.sh root root "root bin daemon sys adm disk wheel floppy dialout tape video"
-echo "\ncentos 0:0 entrypoint"
-docker run --rm -u 0:0 --entrypoint fixuid fixuid-centos fixuid-test.sh root root
+echo "\nfedora 0:0 entrypoint"
+docker run --rm -u 0:0 --entrypoint fixuid fixuid-fedora fixuid-test.sh root root
 echo "\ndebian 0:0 entrypoint"
 docker run --rm -u 0:0 --entrypoint fixuid fixuid-debian fixuid-test.sh root root
 
 echo "\nalpine 0:1001 cmd"
 docker run --rm -u 0:1001 fixuid-alpine fixuid-test.sh root docker
-echo "\ncentos 0:1001 cmd"
-docker run --rm -u 0:1001 fixuid-centos fixuid-test.sh root docker
+echo "\nfedora 0:1001 cmd"
+docker run --rm -u 0:1001 fixuid-fedora fixuid-test.sh root docker
 echo "\ndebian 0:1001 cmd"
 docker run --rm -u 0:1001 fixuid-debian fixuid-test.sh root docker
 echo "\nalpine 0:1001 entrypoint"
 docker run --rm -u 0:1001 --entrypoint fixuid fixuid-alpine fixuid-test.sh root docker "docker root bin daemon sys adm disk wheel floppy dialout tape video"
-echo "\ncentos 0:1001 entrypoint"
-docker run --rm -u 0:1001 --entrypoint fixuid fixuid-centos fixuid-test.sh root docker "docker root"
+echo "\nfedora 0:1001 entrypoint"
+docker run --rm -u 0:1001 --entrypoint fixuid fixuid-fedora fixuid-test.sh root docker "docker root"
 echo "\ndebian 0:1001 entrypoint"
 docker run --rm -u 0:1001 --entrypoint fixuid fixuid-debian fixuid-test.sh root docker "docker root"
 
 echo "\nalpine 1001:0 cmd"
 docker run --rm -u 1001:0 fixuid-alpine fixuid-test.sh docker root
-echo "\ncentos 1001:0 cmd"
-docker run --rm -u 1001:0 fixuid-centos fixuid-test.sh docker root
+echo "\nfedora 1001:0 cmd"
+docker run --rm -u 1001:0 fixuid-fedora fixuid-test.sh docker root
 echo "\ndebian 1001:0 cmd"
 docker run --rm -u 1001:0 fixuid-debian fixuid-test.sh docker root
 echo "\nalpine 1001:0 entrypoint"
 docker run --rm -u 1001:0 --entrypoint fixuid fixuid-alpine fixuid-test.sh docker root "root docker"
-echo "\ncentos 1001:0 entrypoint"
-docker run --rm -u 1001:0 --entrypoint fixuid fixuid-centos fixuid-test.sh docker root "root docker"
+echo "\nfedora 1001:0 entrypoint"
+docker run --rm -u 1001:0 --entrypoint fixuid fixuid-fedora fixuid-test.sh docker root "root docker"
 echo "\ndebian 1001:0 entrypoint"
 docker run --rm -u 1001:0 --entrypoint fixuid fixuid-debian fixuid-test.sh docker root "root users docker"
 
 echo "\nalpine run twice cmd"
 docker run --rm fixuid-alpine sh -c "fixuid-test.sh docker docker && fixuid fixuid-test.sh docker docker"
-echo "\ncentos run twice cmd"
-docker run --rm fixuid-centos sh -c "fixuid-test.sh docker docker && fixuid fixuid-test.sh docker docker"
+echo "\nfedora run twice cmd"
+docker run --rm fixuid-fedora sh -c "fixuid-test.sh docker docker && fixuid fixuid-test.sh docker docker"
 echo "\ndebian run twice cmd"
 docker run --rm fixuid-debian sh -c "fixuid-test.sh docker docker && fixuid fixuid-test.sh docker docker 'docker users'"
 echo "\nalpine run twice entrypoint"
 docker run --rm --entrypoint fixuid fixuid-alpine sh -c "fixuid-test.sh docker docker && fixuid fixuid-test.sh docker docker"
-echo "\ncentos run twice entrypoint"
-docker run --rm --entrypoint fixuid fixuid-centos sh -c "fixuid-test.sh docker docker && fixuid fixuid-test.sh docker docker"
+echo "\nfedora run twice entrypoint"
+docker run --rm --entrypoint fixuid fixuid-fedora sh -c "fixuid-test.sh docker docker && fixuid fixuid-test.sh docker docker"
 echo "\ndebian run twice entrypoint"
 docker run --rm --entrypoint fixuid fixuid-debian sh -c "fixuid-test.sh docker docker 'docker users' && fixuid fixuid-test.sh docker docker 'docker users'"
 
 echo "\nalpine should not chown mount"
 docker run --rm -v $(pwd)/docker/fs-stage/tmp:/home/docker/mnt-dir -v $(pwd)/docker/fs-stage/tmp/test-file:/home/docker/mnt-file -u 1234:1234 fixuid-alpine sh -c "fixuid-test.sh docker docker && fixuid-mount-test.sh $(id -u) $(id -g)"
-echo "\ncentos should not chown mount"
-docker run --rm -v $(pwd)/docker/fs-stage/tmp:/home/docker/mnt-dir -v $(pwd)/docker/fs-stage/tmp/test-file:/home/docker/mnt-file -u 1234:1234 fixuid-centos sh -c "fixuid-test.sh docker docker && fixuid-mount-test.sh $(id -u) $(id -g)"
+echo "\nfedora should not chown mount"
+docker run --rm -v $(pwd)/docker/fs-stage/tmp:/home/docker/mnt-dir -v $(pwd)/docker/fs-stage/tmp/test-file:/home/docker/mnt-file -u 1234:1234 fixuid-fedora sh -c "fixuid-test.sh docker docker && fixuid-mount-test.sh $(id -u) $(id -g)"
 echo "\ndebian should not chown mount"
 docker run --rm -v $(pwd)/docker/fs-stage/tmp:/home/docker/mnt-dir -v $(pwd)/docker/fs-stage/tmp/test-file:/home/docker/mnt-file -u 1234:1234 fixuid-debian sh -c "fixuid-test.sh docker docker && fixuid-mount-test.sh $(id -u) $(id -g)"
 
 echo "\nalpine quiet cmd"
 docker run --rm -e "FIXUID_FLAGS=-q" fixuid-alpine fixuid-test.sh docker docker
-echo "\ncentos quiet cmd"
-docker run --rm -e "FIXUID_FLAGS=-q" fixuid-centos fixuid-test.sh docker docker
+echo "\nfedora quiet cmd"
+docker run --rm -e "FIXUID_FLAGS=-q" fixuid-fedora fixuid-test.sh docker docker
 echo "\ndebian quiet cmd"
 docker run --rm -e "FIXUID_FLAGS=-q" fixuid-debian fixuid-test.sh docker docker
 echo "\nalpine quiet entrypoint"
 docker run --rm --entrypoint fixuid fixuid-alpine -q fixuid-test.sh docker docker
-echo "\ncentos quiet entrypoint"
-docker run --rm --entrypoint fixuid fixuid-centos -q fixuid-test.sh docker docker
+echo "\nfedora quiet entrypoint"
+docker run --rm --entrypoint fixuid fixuid-fedora -q fixuid-test.sh docker docker
 echo "\ndebian quiet entrypoint"
 docker run --rm --entrypoint fixuid fixuid-debian -q fixuid-test.sh docker docker 'docker users'
 
 echo "\nalpine test no escalate"
 docker run --rm --entrypoint fixuid fixuid-alpine test-no-escalate
-echo "\ncentos test no escalate"
-docker run --rm --entrypoint fixuid fixuid-centos test-no-escalate
+echo "\nfedora test no escalate"
+docker run --rm --entrypoint fixuid fixuid-fedora test-no-escalate
 echo "\ndebian test no escalate"
 docker run --rm --entrypoint fixuid fixuid-debian test-no-escalate
 
 printf "\npaths:\n  - /\n  - /home/docker\n  - /tmp/space dir\n  - /does/not/exist" >> docker/alpine/stage/etc/fixuid/config.yml
-printf "\npaths:\n  - /\n  - /home/docker\n  - /tmp/space dir\n  - /does/not/exist" >> docker/centos/stage/etc/fixuid/config.yml
+printf "\npaths:\n  - /\n  - /home/docker\n  - /tmp/space dir\n  - /does/not/exist" >> docker/fedora/stage/etc/fixuid/config.yml
 printf "\npaths:\n  - /\n  - /home/docker\n  - /tmp/space dir\n  - /does/not/exist" >> docker/debian/stage/etc/fixuid/config.yml
 docker compose build
 
 echo "\nalpine 1001:1001 cmd"
 docker run --rm -u 1001:1001 -v /home/docker -v "/tmp/space dir" fixuid-alpine fixuid-test.sh docker docker
-echo "\ncentos 1001:1001 cmd"
-docker run --rm -u 1001:1001 -v /home/docker -v "/tmp/space dir" fixuid-centos fixuid-test.sh docker docker
+echo "\nfedora 1001:1001 cmd"
+docker run --rm -u 1001:1001 -v /home/docker -v "/tmp/space dir" fixuid-fedora fixuid-test.sh docker docker
 echo "\ndebian 1001:1001 cmd"
 docker run --rm -u 1001:1001 -v /home/docker -v "/tmp/space dir" fixuid-debian fixuid-test.sh docker docker
 echo "\nalpine 1001:1001 entrypoint"
 docker run --rm -u 1001:1001 -v /home/docker -v "/tmp/space dir" --entrypoint fixuid fixuid-alpine fixuid-test.sh docker docker
-echo "\ncentos 1001:1001 entrypoint"
-docker run --rm -u 1001:1001 -v /home/docker -v "/tmp/space dir" --entrypoint fixuid fixuid-centos fixuid-test.sh docker docker
+echo "\nfedora 1001:1001 entrypoint"
+docker run --rm -u 1001:1001 -v /home/docker -v "/tmp/space dir" --entrypoint fixuid fixuid-fedora fixuid-test.sh docker docker
 echo "\ndebian 1001:1001 entrypoint"
 docker run --rm -u 1001:1001 -v /home/docker -v "/tmp/space dir" --entrypoint fixuid fixuid-debian fixuid-test.sh docker docker "docker users"