diff --git a/Dockerfile b/Dockerfile index 9618369..ea76470 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,9 +19,9 @@ RUN ARCH=$(uname -m) && \ wget -q "https://github.com/moby/buildkit/releases/download/v0.21.0/buildkit-v0.21.0.linux-$SUFFIX.tar.gz" --output-document=- | tar --gz --extract --directory=/usr/local bin/buildctl && \ chmod 555 /usr/local/bin/jq +COPY --chmod=555 entrypoint.sh /usr/local/bin/entrypoint.sh +ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] + RUN mkdir -p /home/buildkit/.docker/ && echo '{}' > /home/buildkit/.docker/config.json && chown 1000:1000 /home/buildkit -R ENV HOME=/home/buildkit USER 1000:1000 - -COPY --chmod=555 entrypoint.sh /usr/local/bin/entrypoint.sh -ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] diff --git a/entrypoint.sh b/entrypoint.sh index f2b83b0..6d90529 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -21,12 +21,6 @@ fi SOURCE_DATE_EPOCH=${PLUGIN_SOURCE_DATE_EPOCH:-0} if [[ -n "${PLUGIN_AUTH:-}" ]]; then - echo $HOME - ls -lA $HOME/.. - ls -lA $HOME - - whoami - mkdir -p "$HOME/.docker" echo "$PLUGIN_AUTH" | jq -r 'to_entries|map({(.key):{"auth":(.value.username+":"+.value.password)|@base64}})|add|{"auths":.}' > "$HOME/.docker/config.json" echo "Stored credentials at $HOME/.docker/config.json" cat "$HOME/.docker/config.json" | base64 -w0