Skip to content

Commit 653d0c2

Browse files
jefferytoynezz
authored andcommitted
Don't build packages as root
Signed-off-by: Jeffery To <[email protected]>
1 parent 67b6262 commit 653d0c2

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,4 @@ LABEL "com.github.actions.name"="OpenWrt SDK"
66

77
ADD entrypoint.sh /
88

9-
USER root
10-
119
ENTRYPOINT ["/entrypoint.sh"]

action.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ author: aparcar
44
runs:
55
using: 'composite'
66
steps:
7+
- run: mkdir $GITHUB_WORKSPACE/artifacts
8+
shell: bash
9+
- run: chmod o+rw $GITHUB_WORKSPACE/artifacts
10+
shell: bash
711
- run: docker build --build-arg CONTAINER --build-arg ARCH -t sdk $GITHUB_ACTION_PATH
812
shell: bash
913
- run: |
@@ -24,3 +28,7 @@ runs:
2428
-v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE \
2529
sdk
2630
shell: bash
31+
- run: cp -r $GITHUB_WORKSPACE/artifacts/. $GITHUB_WORKSPACE/
32+
shell: bash
33+
- run: sudo rm -rf $GITHUB_WORKSPACE/artifacts/
34+
shell: bash

entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ else
125125
fi
126126

127127
if [ -d bin/ ]; then
128-
mv bin/ "$GITHUB_WORKSPACE/"
128+
mv bin/ "$GITHUB_WORKSPACE/artifacts/"
129129
fi
130130

131131
if [ -d logs/ ]; then
132-
mv logs/ "$GITHUB_WORKSPACE/"
132+
mv logs/ "$GITHUB_WORKSPACE/artifacts/"
133133
fi

0 commit comments

Comments
 (0)