Create .dockerignore

dogruis · Dec 11, 2024 · 5ec0ae6 · 5ec0ae6
1 parent e83b04f
commit 5ec0ae6
Show file tree

Hide file tree

Showing 10 changed files with 205 additions and 134 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1 @@
+.gitignore
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,11 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+
       - run: sudo apt-get update && sudo apt-get install -y --no-install-recommends binfmt-support qemu-user-static
+
       - run: ./build.sh
-      - run: ./test.sh shellsu-amd64
-      - run: ./test.sh shellsu-i386
-      - run: ./test.sh --debian shellsu-amd64
-      - run: ./test.sh --debian shellsu-i386
+      - run: ./test.sh --alpine shellsu
+      - run: ./test.sh --debian shellsu
       - run: docker build --pull --file hub/Dockerfile.alpine hub
       - run: docker build --pull --file hub/Dockerfile.debian hub
diff --git a/Dockerfile b/Dockerfile
@@ -5,50 +5,25 @@ FROM debian:bookworm-slim
 RUN set -eux; \
     apt-get update; \
     apt-get install -y --no-install-recommends \
-        arch-test \
         file \
         bash \
+        login \
     ; \
     rm -rf /var/lib/apt/lists/*
 
 # Set environment variable for build flags
 ENV BUILD_FLAGS="-v"
 
-# Prepare the `shellsu` build and test script
-RUN set -eux; \
-    { \
-        echo '#!/usr/bin/env bash'; \
-        echo 'set -Eeuo pipefail -x'; \
-        echo 'ARCH="${ARCH:-$(uname -m)}"'; \
-        echo 'cp /usr/local/bin/shellsu /usr/local/bin/shellsu-$ARCH'; \
-        echo 'file "/usr/local/bin/shellsu-$ARCH"'; \
-        echo 'if arch-test "$ARCH"; then'; \
-        echo '  try() { for (( i = 0; i < 30; i++ )); do if timeout 1s "$@"; then return 0; fi; done; return 1; }'; \
-        echo '  try "/usr/local/bin/shellsu-$ARCH" --version'; \
-        echo '  try "/usr/local/bin/shellsu-$ARCH" nobody id'; \
-        echo '  try "/usr/local/bin/shellsu-$ARCH" nobody ls -l /proc/self/fd'; \
-        echo 'fi'; \
-    } > /usr/local/bin/shellsu-build-and-test.sh; \
-    chmod +x /usr/local/bin/shellsu-build-and-test.sh
-
-# Disable CGO (not relevant for Bash, but keeping for alignment with original pattern)
-ENV CGO_ENABLED 0
-
 # Copy `shellsu` script into the container
 WORKDIR /usr/local/bin
-COPY shellsu /usr/local/bin/shellsu
+COPY shellsu.sh /usr/local/bin/shellsu
 RUN chmod +x /usr/local/bin/shellsu
 
-# Test `shellsu` for various architectures
-RUN ARCH=amd64    shellsu-build-and-test.sh
-RUN ARCH=i386     shellsu-build-and-test.sh
-RUN ARCH=armel    shellsu-build-and-test.sh
-RUN ARCH=armhf    shellsu-build-and-test.sh
-RUN ARCH=arm64    shellsu-build-and-test.sh
-RUN ARCH=mips64el shellsu-build-and-test.sh
-RUN ARCH=ppc64el  shellsu-build-and-test.sh
-RUN ARCH=riscv64  shellsu-build-and-test.sh
-RUN ARCH=s390x    shellsu-build-and-test.sh
+# Test `shellsu` to verify functionality
+RUN set -eux; \
+    # Run the script with basic tests
+    ./shellsu --help; \
+    ./shellsu --version
 
-# Final verification step
-RUN set -eux; ls -lAFh /usr/local/bin/shellsu-*; file /usr/local/bin/shellsu-*
+# Final verification step (list files and check permissions)
+RUN set -eux; ls -lAFh /usr/local/bin/shellsu; file /usr/local/bin/shellsu
diff --git a/Dockerfile.test-alpine b/Dockerfile.test-alpine
@@ -1,40 +1,49 @@
 FROM alpine:3.20
 
+RUN apk add --no-cache bash coreutils shadow
+
 # Add "nobody" to ALL groups to create edge cases for testing
 RUN cut -d: -f1 /etc/group | xargs -rtn1 addgroup nobody
 
 # Create the `shellsu-t` testing script
 RUN { \
-		echo '#!/bin/sh'; \
-		echo 'set -ex'; \
-		echo; \
-		echo 'spec="$1"; shift'; \
-		echo; \
-		echo 'expec="$1"; shift'; \
-		echo 'real="$(shellsu "$spec" id -u):$(shellsu "$spec" id -g):$(shellsu "$spec" id -G)"'; \
-		echo '[ "$expec" = "$real" ]'; \
-		echo; \
-		echo 'expec="$1"; shift'; \
-		echo 'real="$(shellsu "$spec" id -un):$(shellsu "$spec" id -gn):$(shellsu "$spec" id -Gn)" || true'; \
-		echo '[ "$expec" = "$real" ]'; \
-	} > /usr/local/bin/shellsu-t \
-	&& chmod +x /usr/local/bin/shellsu-t
+    echo '#!/bin/sh'; \
+    echo 'set -ex'; \
+    echo; \
+    echo 'spec="$1"; shift'; \
+    echo; \
+    echo 'expec="$1"; shift'; \
+    echo 'real="$(/usr/local/bin/shellsu "$spec" id -u):$(/usr/local/bin/shellsu "$spec" id -g):$(/usr/local/bin/shellsu "$spec" id -G)"'; \
+    echo '[ "$expec" = "$real" ] || { echo "Test failed"; exit 1; }'; \
+    echo; \
+    echo 'expec="$1"; shift'; \
+    echo 'real="$(/usr/local/bin/shellsu "$spec" id -un):$(/usr/local/bin/shellsu "$spec" id -gn):$(/usr/local/bin/shellsu "$spec" id -Gn)" || true'; \
+    echo '[ "$expec" = "$real" ] || { echo "Test failed"; exit 1; }'; \
+} > /usr/local/bin/shellsu-t \
+&& chmod +x /usr/local/bin/shellsu-t
 
 # Copy the `shellsu` binary/script into the image
-COPY shellsu /usr/local/bin/
+RUN ls -la
+RUN pwd
+COPY shellsu /usr/local/bin/shellsu
 RUN chmod +x /usr/local/bin/shellsu
+RUN ls -la /usr/local/bin/
+RUN echo $PATH
+RUN ls -l $(which su)
 
 # Adjust permissions for testing unusual cases
 RUN chgrp nobody /usr/local/bin/shellsu \
 	&& chmod +s /usr/local/bin/shellsu
 
 # Configure an environment for testing
-ENV SHELLSU_INSECURE_MODE="I've seen things you people wouldn't believe. Attack ships on fire off the shoulder of Orion. I watched C-beams glitter in the dark near the Tannhäuser Gate. All those moments will be lost in time, like tears in rain. Time to die."
+ENV SHELLSU_INSECURE_FLAG="I've seen things you people wouldn't believe. Attack ships on fire off the shoulder of Orion. I watched C-beams glitter in the dark near the Tannhäuser Gate. All those moments will be lost in time, like tears in rain. Time to die."
 USER nobody
 ENV HOME /omg/really/shellsu/nowhere
 
 # Validate initial state
 RUN id
+RUN cat /etc/passwd
+RUN cat /etc/group
 
 # Test various user/group configurations
 RUN shellsu-t 0 "0:0:$(id -G root)" "root:root:$(id -Gn root)"

diff --git a/Dockerfile.test-debian b/Dockerfile.test-debian
@@ -1,5 +1,16 @@
 FROM debian:bookworm-slim
 
+# Install necessary dependencies
+RUN set -eux; \
+    apt-get update; \
+    apt-get install -y --no-install-recommends \
+        file \
+        bash \
+        login \
+    ; \
+    rm -rf /var/lib/apt/lists/*
+
+
 # Add "nobody" to ALL groups to create edge cases for testing
 RUN cut -d: -f1 /etc/group | xargs -rtI'{}' usermod -aG '{}' nobody
 # Emulate Alpine's "games" user, which is part of the "users" group
@@ -13,30 +24,38 @@ RUN { \
 		echo 'spec="$1"; shift'; \
 		echo; \
 		echo 'expec="$1"; shift'; \
-		echo 'real="$(shellsu "$spec" id -u):$(shellsu "$spec" id -g):$(shellsu "$spec" id -G)"'; \
+		echo 'real="$(/usr/local/bin/shellsu "$spec" id -u):$(/usr/local/bin/shellsu "$spec" id -g):$(/usr/local/bin/shellsu "$spec" id -G)"'; \
 		echo '[ "$expec" = "$real" ]'; \
 		echo; \
 		echo 'expec="$1"; shift'; \
-		echo 'real="$(shellsu "$spec" id -un):$(shellsu "$spec" id -gn):$(shellsu "$spec" id -Gn)" || true'; \
+		echo 'real="$(/usr/local/bin/shellsu "$spec" id -un):$(/usr/local/bin/shellsu "$spec" id -gn):$(/usr/local/bin/shellsu "$spec" id -Gn)" || true'; \
 		echo '[ "$expec" = "$real" ]'; \
 	} > /usr/local/bin/shellsu-t \
 	&& chmod +x /usr/local/bin/shellsu-t
 
 # Copy the `shellsu` binary/script into the image
-COPY shellsu /usr/local/bin/
+RUN ls -la
+RUN pwd
+COPY shellsu /usr/local/bin/shellsu
+COPY shellsu /usr/local/bin/shellsu
 RUN chmod +x /usr/local/bin/shellsu
+RUN ls -la /usr/local/bin/
+RUN echo $PATH
+RUN ls -l $(which su)
 
 # Adjust permissions for testing unusual cases
 RUN chgrp nogroup /usr/local/bin/shellsu \
 	&& chmod +s /usr/local/bin/shellsu
 
 # Configure an environment for testing
-ENV SHELLSU_INSECURE_MODE="I've seen things you people wouldn't believe. Attack ships on fire off the shoulder of Orion. I watched C-beams glitter in the dark near the Tannhäuser Gate. All those moments will be lost in time, like tears in rain. Time to die."
+ENV SHELLSU_INSECURE_FLAG="I've seen things you people wouldn't believe. Attack ships on fire off the shoulder of Orion. I watched C-beams glitter in the dark near the Tannhäuser Gate. All those moments will be lost in time, like tears in rain. Time to die."
 USER nobody
 ENV HOME /omg/really/shellsu/nowhere
 
 # Validate initial state
 RUN id
+RUN cat /etc/passwd
+RUN cat /etc/group
 
 # Test various user/group configurations
 RUN shellsu-t 0 "0:0:$(id -G root)" "root:root:$(id -Gn root)"

diff --git a/build.sh b/build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # Navigate to the directory containing this script
@@ -7,20 +7,17 @@ cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
 set -x
 
 # Build the Docker image
-docker build --pull -t shellsu .
+docker build --no-cache --pull -t shellsu .
 
-# Clean up any pre-existing artifacts
 rm -f shellsu* SHA256SUMS*
 
-# Extract the `shellsu` binaries from the built image
-docker run --rm shellsu sh -c 'cd /go/bin && tar -c shellsu*' | tar -xv
+docker run --rm --entrypoint cat shellsu /usr/local/bin/shellsu > shellsu
 
-# Generate SHA256 checksums for the extracted files
-sha256sum shellsu* | tee SHA256SUMS
+chmod +x shellsu
 
-# Inspect the extracted files
-file shellsu*
-ls -lFh shellsu* SHA256SUMS*
+sha256sum shellsu | tee SHA256SUMS
 
-# Run the built binary to verify functionality
-"./shellsu-$(dpkg --print-architecture)" --help
+file shellsu
+ls -lFh shellsu SHA256SUMS
+
+"./shellsu" --help
diff --git a/hub/Dockerfile.alpine b/hub/Dockerfile.alpine
@@ -1,6 +1,6 @@
 FROM alpine:3.20
 
-# https://github.com/tianon/shellsu/releases
+# https://github.com/dogruis/shellsu/releases
 ENV SHELLSU_VERSION 1.17
 
 RUN set -eux; \

diff --git a/hub/Dockerfile.debian b/hub/Dockerfile.debian
@@ -1,6 +1,6 @@
 FROM debian:bookworm-slim
 
-# https://github.com/tianon/shellsu/releases
+# https://github.com/dogruis/shellsu/releases
 ENV SHELLSU_VERSION 1.17
 
 RUN set -eux; \