Skip to content

Commit 024f15f

Browse files
committed
feat: change Dockerfile naming convention
* Updated `generate-dockerfiles.sh` to use hyphens in Dockerfile names for consistency. * Modified `action-docker-publish.yml` to ensure proper variable expansion. * Added permissions section in `action-package-cleanup.yml` for better access control.
1 parent 1cdc0df commit 024f15f

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

.github/workflows/action-docker-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ jobs:
4646

4747
- id: set-matrix
4848
run: |
49-
shortnamearray=$(cat shortnamearray.json)
49+
shortnamearray=$(cat "shortnamearray.json")
5050
echo "${shortnamearray}"
51-
echo -n "matrix=${shortnamearray}" >> $GITHUB_OUTPUT
51+
echo -n "matrix=${shortnamearray}" >> ${GITHUB_OUTPUT}
5252
5353
generate-docker-compose:
5454
name: Generate docker-compose.yml files

.github/workflows/action-package-cleanup.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ on:
44
schedule:
55
- cron: "5 4 * * 3"
66

7+
permissions:
8+
contents: read
9+
packages: write
10+
711
jobs:
812
package-cleanup:
913
name: Cleanup Old GitHub Packages

generate-dockerfiles.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ while read -r line; do
1414
export gamename
1515
distro=$(echo "$line" | awk -F, '{ print $4 }')
1616
export distro
17-
touch "dockerfiles/Dockerfile.${shortname}"
18-
echo "Generating Dockerfile.${shortname} (${gamename})"
19-
jinjanate Dockerfile.j2 >"dockerfiles/Dockerfile.${shortname}"
17+
touch "dockerfiles/Dockerfile-${shortname}"
18+
echo "Generating Dockerfile-${shortname} (${gamename})"
19+
jinjanate Dockerfile-j2 >"dockerfiles/Dockerfile-${shortname}"
2020
{ printf '{"shortname":"%s"},' "$shortname"; } >>"shortnamearray.json"
2121
done < <(tail -n +2 serverlist.csv)
2222
sed -i '$ s/.$//' "shortnamearray.json"

0 commit comments

Comments
 (0)