From f8fb7b9abdd95cbcf7dcde19dbd4cde1526c054a Mon Sep 17 00:00:00 2001 From: Malk Date: Tue, 12 Nov 2024 07:34:13 -0500 Subject: [PATCH] Build only production and copy sliver client to docker --- .github/workflows/docker-image.yml | 1 + Dockerfile | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index f8631ea9b7..535d4291ea 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -81,6 +81,7 @@ jobs: labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max + target: 'production' # Sign the resulting Docker image digest except on PRs. # This will only write to the public Rekor transparency log when the Docker diff --git a/Dockerfile b/Dockerfile index 74c92d8c1f..fbf31631c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ RUN apt-get update --fix-missing && apt-get -y install \ git build-essential zlib1g zlib1g-dev wget zip unzip ### Add sliver user -RUN groupadd -g 999 sliver && useradd -r -u 999 -g sliver sliver +RUN groupadd -g 1000 sliver && useradd -r -u 1000 -g sliver sliver RUN mkdir -p /home/sliver/ && chown -R sliver:sliver /home/sliver ### Build sliver: @@ -25,6 +25,7 @@ ADD . /go/src/github.com/bishopfox/sliver/ RUN make clean-all RUN make RUN cp -vv sliver-server /opt/sliver-server +RUN cp -vv sliver-client /opt/sliver-client # STAGE: test ## Run unit tests against the compiled instance @@ -72,8 +73,8 @@ RUN apt-get remove -y curl gnupg \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ### Add sliver user -RUN groupadd -g 999 sliver \ - && useradd -r -u 999 -g sliver sliver \ +RUN groupadd -g 1000 sliver \ + && useradd -r -u 1000 -g sliver sliver \ && mkdir -p /home/sliver/ \ && chown -R sliver:sliver /home/sliver \ && su -l sliver -c 'mkdir -p ~/.msf4/ && touch ~/.msf4/initial_setup_complete' @@ -103,8 +104,8 @@ RUN apt-get autoremove -y \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ### Add sliver user -RUN groupadd -g 999 sliver \ - && useradd -r -u 999 -g sliver sliver \ +RUN groupadd -g 1000 sliver \ + && useradd -r -u 1000 -g sliver sliver \ && mkdir -p /home/sliver/ \ && chown -R sliver:sliver /home/sliver