Skip to content

Commit

Permalink
chore: switch to user
Browse files Browse the repository at this point in the history
  • Loading branch information
rcwbr committed Jan 25, 2025
1 parent 1cefc50 commit 0d3d12d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/push-workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ jobs:
cat /usr/local/bin/pre-commit
ls -la /opt/devcontainers/pre-commit/
env
su codespace
ls -la
git config --global --add safe.directory $GITHUB_WORKSPACE
git status
pre-commit run --verbose --show-diff-on-failure --color=always --all-files
Expand Down
10 changes: 5 additions & 5 deletions pre-commit/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN DEBIAN_FRONTEND=noninteractive \
&& rm -rf /var/lib/apt/lists/*

# Prep folder for pre-commit
ARG DEVCONTAINER_PRE_COMMIT=/opt/devcontainers/pre-commit
ENV DEVCONTAINER_PRE_COMMIT=/opt/devcontainers/pre-commit
RUN \
mkdir -p "$DEVCONTAINER_PRE_COMMIT" \
&& chmod a+rx "$DEVCONTAINER_PRE_COMMIT" \
Expand All @@ -37,14 +37,14 @@ RUN \
--mount=type=bind,from=local_context,source=.pre-commit-config.yaml,target=/tmp/.pre-commit-config.yaml \
python -m venv "$DEVCONTAINER_PRE_COMMIT/venv" \
&& source "$DEVCONTAINER_PRE_COMMIT/venv/bin/activate" \
&& mkdir "$HOME/tmp_repo" \
&& cd "$HOME/tmp_repo" \
&& mkdir "$DEVCONTAINER_PRE_COMMIT/tmp_repo" \
&& cd "$DEVCONTAINER_PRE_COMMIT/tmp_repo" \
&& cp /tmp/.pre-commit-config.yaml . \
&& git init . \
&& pip install --no-cache-dir pre-commit==4.0.1 \
&& pre-commit install-hooks \
&& cd \
&& rm -rf "$HOME/tmp_repo"
&& cd "$DEVCONTAINER_PRE_COMMIT" \
&& rm -rf "$DEVCONTAINER_PRE_COMMIT/tmp_repo"

COPY --from=common_context on_create_command /opt/devcontainers/on_create_command
# Include pre-commit initialization in config for devcontainers onCreateCommand
Expand Down
2 changes: 1 addition & 1 deletion pre-commit/pre-commit
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

PATH="/opt/devcontainers/pre-commit/venv/bin:$PATH" "/opt/devcontainers/pre-commit/venv/bin/pre-commit" "$@"
PATH="$DEVCONTAINER_PRE_COMMIT/venv/bin:$PATH" "$DEVCONTAINER_PRE_COMMIT/venv/bin/pre-commit" "$@"

0 comments on commit 0d3d12d

Please sign in to comment.