From 3ccd78325a37d27fec18aa91007313a30259dc11 Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Fri, 14 May 2021 09:09:58 -0400 Subject: [PATCH] revert to root due to npm issues --- docker/Dockerfile.linux.amd64 | 9 +++++---- docker/Dockerfile.linux.arm | 10 ++++++---- docker/Dockerfile.linux.arm6 | 10 ++++++---- docker/Dockerfile.linux.arm64 | 10 ++++++---- docker/Dockerfile.linux.arm7 | 10 ++++++---- docker/Dockerfile.linux.arm8 | 10 ++++++---- posix/clone | 12 ++++++------ 7 files changed, 41 insertions(+), 30 deletions(-) diff --git a/docker/Dockerfile.linux.amd64 b/docker/Dockerfile.linux.amd64 index 1b3b33d..76d96ad 100644 --- a/docker/Dockerfile.linux.amd64 +++ b/docker/Dockerfile.linux.amd64 @@ -2,9 +2,10 @@ FROM alpine:3.12 RUN apk add --no-cache ca-certificates git git-lfs openssh curl perl aws-cli sudo ADD posix/* /usr/local/bin/ -RUN adduser -g Drone -s /bin/sh -D -u 1000 drone -RUN echo 'drone ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/drone -USER drone:drone -RUN chmod -R 777 /home/drone + +# RUN adduser -g Drone -s /bin/sh -D -u 1000 drone +# RUN echo 'drone ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/drone +# USER drone:drone +# RUN chmod -R 777 /home/drone ENTRYPOINT ["/usr/local/bin/clone"] \ No newline at end of file diff --git a/docker/Dockerfile.linux.arm b/docker/Dockerfile.linux.arm index 2142776..a79cd35 100644 --- a/docker/Dockerfile.linux.arm +++ b/docker/Dockerfile.linux.arm @@ -2,8 +2,10 @@ FROM arm32v6/alpine:3.12 RUN apk add --no-cache ca-certificates git git-lfs openssh curl perl aws-cli sudo ADD posix/* /usr/local/bin/ -RUN adduser -g Drone -s /bin/sh -D -u 1000 drone -RUN echo 'drone ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/drone -USER drone:drone -RUN chmod -R 777 /home/drone + +# RUN adduser -g Drone -s /bin/sh -D -u 1000 drone +# RUN echo 'drone ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/drone +# USER drone:drone +# RUN chmod -R 777 /home/drone + ENTRYPOINT ["/usr/local/bin/clone"] diff --git a/docker/Dockerfile.linux.arm6 b/docker/Dockerfile.linux.arm6 index 2142776..a79cd35 100644 --- a/docker/Dockerfile.linux.arm6 +++ b/docker/Dockerfile.linux.arm6 @@ -2,8 +2,10 @@ FROM arm32v6/alpine:3.12 RUN apk add --no-cache ca-certificates git git-lfs openssh curl perl aws-cli sudo ADD posix/* /usr/local/bin/ -RUN adduser -g Drone -s /bin/sh -D -u 1000 drone -RUN echo 'drone ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/drone -USER drone:drone -RUN chmod -R 777 /home/drone + +# RUN adduser -g Drone -s /bin/sh -D -u 1000 drone +# RUN echo 'drone ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/drone +# USER drone:drone +# RUN chmod -R 777 /home/drone + ENTRYPOINT ["/usr/local/bin/clone"] diff --git a/docker/Dockerfile.linux.arm64 b/docker/Dockerfile.linux.arm64 index 74ca9e1..73c2616 100644 --- a/docker/Dockerfile.linux.arm64 +++ b/docker/Dockerfile.linux.arm64 @@ -2,8 +2,10 @@ FROM arm64v8/alpine:3.12 RUN apk add --no-cache ca-certificates git git-lfs openssh curl perl aws-cli sudo ADD posix/* /usr/local/bin/ -RUN adduser -g Drone -s /bin/sh -D -u 1000 drone -RUN echo 'drone ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/drone -USER drone:drone -RUN chmod -R 777 /home/drone + +# RUN adduser -g Drone -s /bin/sh -D -u 1000 drone +# RUN echo 'drone ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/drone +# USER drone:drone +# RUN chmod -R 777 /home/drone + ENTRYPOINT ["/usr/local/bin/clone"] diff --git a/docker/Dockerfile.linux.arm7 b/docker/Dockerfile.linux.arm7 index 2142776..a79cd35 100644 --- a/docker/Dockerfile.linux.arm7 +++ b/docker/Dockerfile.linux.arm7 @@ -2,8 +2,10 @@ FROM arm32v6/alpine:3.12 RUN apk add --no-cache ca-certificates git git-lfs openssh curl perl aws-cli sudo ADD posix/* /usr/local/bin/ -RUN adduser -g Drone -s /bin/sh -D -u 1000 drone -RUN echo 'drone ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/drone -USER drone:drone -RUN chmod -R 777 /home/drone + +# RUN adduser -g Drone -s /bin/sh -D -u 1000 drone +# RUN echo 'drone ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/drone +# USER drone:drone +# RUN chmod -R 777 /home/drone + ENTRYPOINT ["/usr/local/bin/clone"] diff --git a/docker/Dockerfile.linux.arm8 b/docker/Dockerfile.linux.arm8 index 74ca9e1..73c2616 100644 --- a/docker/Dockerfile.linux.arm8 +++ b/docker/Dockerfile.linux.arm8 @@ -2,8 +2,10 @@ FROM arm64v8/alpine:3.12 RUN apk add --no-cache ca-certificates git git-lfs openssh curl perl aws-cli sudo ADD posix/* /usr/local/bin/ -RUN adduser -g Drone -s /bin/sh -D -u 1000 drone -RUN echo 'drone ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/drone -USER drone:drone -RUN chmod -R 777 /home/drone + +# RUN adduser -g Drone -s /bin/sh -D -u 1000 drone +# RUN echo 'drone ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/drone +# USER drone:drone +# RUN chmod -R 777 /home/drone + ENTRYPOINT ["/usr/local/bin/clone"] diff --git a/posix/clone b/posix/clone index bbf5952..2f8d624 100755 --- a/posix/clone +++ b/posix/clone @@ -5,8 +5,8 @@ if [[ -n "${DRONE_WORKSPACE}" ]]; then # to the workspace. This is required because # the workspace is a docker volume and is owned # by root. - sudo mkdir -p ${DRONE_WORKSPACE} - sudo chown drone:drone ${DRONE_WORKSPACE} + # sudo mkdir -p ${DRONE_WORKSPACE} + # sudo chown drone:drone ${DRONE_WORKSPACE} # ensure the workspace is the current working # directory. This should already be the case, @@ -16,10 +16,10 @@ fi # force the home directory path. -if [ "$HOME" != "/home/drone" ]; then - echo "[DEBUG] setting default home directory" - export HOME=/home/drone -fi +# if [ "$HOME" != "/home/drone" ]; then +# echo "[DEBUG] setting default home directory" +# export HOME=/home/drone +# fi # if the netrc enviornment variables exist, write # the netrc file.