Skip to content

Commit f5427d4

Browse files
aptalcaaptalca
committed
swag-maxmind update/add workflows
1 parent 684b084 commit f5427d4

File tree

6 files changed

+71
-87
lines changed

6 files changed

+71
-87
lines changed

‎.github/workflows/BuildImage.yml‎

Lines changed: 35 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,45 @@
11
name: Build Image
22

3-
on: [push, pull_request, workflow_dispatch]
3+
on: [push, pull_request_target, workflow_dispatch]
44

55
env:
6-
ENDPOINT: "linuxserver/mods"
7-
BASEIMAGE: "swag"
8-
MODNAME: "maxmind"
6+
GITHUB_REPO: "linuxserver/docker-mods" #don't modify
7+
ENDPOINT: "linuxserver/mods" #don't modify
8+
BASEIMAGE: "swag" #replace
9+
MODNAME: "maxmind" #replace
910

1011
jobs:
11-
build:
12+
set-vars:
1213
runs-on: ubuntu-latest
1314
steps:
14-
- uses: actions/[email protected]
15-
16-
- name: Build image
17-
run: |
18-
docker build --no-cache -t ${{ github.sha }} .
19-
20-
- name: Tag image
21-
if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) }}
22-
run: |
23-
docker tag ${{ github.sha }} ${ENDPOINT}:${BASEIMAGE}-${MODNAME}
24-
docker tag ${{ github.sha }} ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }}
25-
docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}
26-
docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }}
27-
28-
- name: Credential check
29-
if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) }}
30-
run: |
31-
echo "CR_USER=${{ secrets.CR_USER }}" >> $GITHUB_ENV
32-
echo "CR_PAT=${{ secrets.CR_PAT }}" >> $GITHUB_ENV
33-
echo "DOCKERUSER=${{ secrets.DOCKERUSER }}" >> $GITHUB_ENV
34-
echo "DOCKERPASS=${{ secrets.DOCKERPASS }}" >> $GITHUB_ENV
35-
if [[ "${{ secrets.CR_USER }}" == "" && "${{ secrets.CR_PAT }}" == "" && "${{ secrets.DOCKERUSER }}" == "" && "${{ secrets.DOCKERPASS }}" == "" ]]; then
36-
echo "::error::Push credential secrets missing."
37-
echo "::error::You must set either CR_USER & CR_PAT or DOCKERUSER & DOCKERPASS as secrets in your repo settings."
38-
echo "::error::See https://github.com/linuxserver/docker-mods/blob/master/README.md for more information/instructions."
39-
exit 1
40-
fi
41-
42-
- name: Login to GitHub Container Registry
43-
if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.CR_USER && env.CR_PAT }}
44-
run: |
45-
echo "${{ secrets.CR_PAT }}" | docker login ghcr.io -u ${{ secrets.CR_USER }} --password-stdin
46-
47-
- name: Push tags to GitHub Container Registry
48-
if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.CR_USER && env.CR_PAT }}
15+
- name: Set Vars
16+
id: outputs
4917
run: |
50-
docker push ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }}
51-
docker push ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}
18+
echo "GITHUB_REPO=${{ env.GITHUB_REPO }}" >> $GITHUB_OUTPUT
19+
echo "ENDPOINT=${{ env.ENDPOINT }}" >> $GITHUB_OUTPUT
20+
echo "BASEIMAGE=${{ env.BASEIMAGE }}" >> $GITHUB_OUTPUT
21+
echo "MODNAME=${{ env.MODNAME }}" >> $GITHUB_OUTPUT
22+
# **** If the mod needs to be versioned, set the versioning logic below. Otherwise leave as is. ****
23+
MOD_VERSION=""
24+
echo "MOD_VERSION=${MOD_VERSION}" >> $GITHUB_OUTPUT
25+
outputs:
26+
GITHUB_REPO: ${{ steps.outputs.outputs.GITHUB_REPO }}
27+
ENDPOINT: ${{ steps.outputs.outputs.ENDPOINT }}
28+
BASEIMAGE: ${{ steps.outputs.outputs.BASEIMAGE }}
29+
MODNAME: ${{ steps.outputs.outputs.MODNAME }}
30+
MOD_VERSION: ${{ steps.outputs.outputs.MOD_VERSION }}
5231

53-
- name: Login to DockerHub
54-
if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.DOCKERUSER && env.DOCKERPASS }}
55-
run: |
56-
echo ${{ secrets.DOCKERPASS }} | docker login -u ${{ secrets.DOCKERUSER }} --password-stdin
57-
58-
- name: Push tags to DockerHub
59-
if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.DOCKERUSER && env.DOCKERPASS }}
60-
run: |
61-
docker push ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }}
62-
docker push ${ENDPOINT}:${BASEIMAGE}-${MODNAME}
32+
build:
33+
uses: linuxserver/github-workflows/.github/workflows/docker-mod-builder.yml@v1
34+
needs: set-vars
35+
secrets:
36+
CR_USER: ${{ secrets.CR_USER }}
37+
CR_PAT: ${{ secrets.CR_PAT }}
38+
DOCKERUSER: ${{ secrets.DOCKERUSER }}
39+
DOCKERPASS: ${{ secrets.DOCKERPASS }}
40+
with:
41+
GITHUB_REPO: ${{ needs.set-vars.outputs.GITHUB_REPO }}
42+
ENDPOINT: ${{ needs.set-vars.outputs.ENDPOINT }}
43+
BASEIMAGE: ${{ needs.set-vars.outputs.BASEIMAGE }}
44+
MODNAME: ${{ needs.set-vars.outputs.MODNAME }}
45+
MOD_VERSION: ${{ needs.set-vars.outputs.MOD_VERSION }}

‎.github/workflows/call_issue_pr_tracker.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Issue & PR Tracker
2+
3+
on:
4+
issues:
5+
types: [opened,reopened,labeled,unlabeled,closed]
6+
pull_request_target:
7+
types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled,closed]
8+
pull_request_review:
9+
types: [submitted,edited,dismissed]
10+
11+
jobs:
12+
manage-project:
13+
permissions:
14+
issues: write
15+
uses: linuxserver/github-workflows/.github/workflows/issue-pr-tracker.yml@v1
16+
secrets: inherit

‎.github/workflows/permissions.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: Permission check
2+
on:
3+
pull_request_target:
4+
paths:
5+
- '**/run'
6+
- '**/finish'
7+
- '**/check'
8+
jobs:
9+
permission_check:
10+
uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1

‎Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# syntax=docker/dockerfile:1
2+
13
FROM scratch
24

35
LABEL maintainer="quietsy"

‎root/etc/cont-init.d/98-maxmind‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-setup/run‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,26 @@ echo "Applying the maxmind mod..."
55
# create GeoIP2 folder symlink
66
mkdir -p \
77
/config/geoip2db
8-
[[ -d /var/lib/libmaxminddb ]] && [[ ! -L /var/lib/libmaxminddb ]] && \
8+
if [[ -d /var/lib/libmaxminddb ]] && [[ ! -L /var/lib/libmaxminddb ]]; then
99
rm -rf /var/lib/libmaxminddb
10-
[[ ! -d /var/lib/libmaxminddb ]] && \
10+
fi
11+
if [[ ! -d /var/lib/libmaxminddb ]]; then
1112
ln -s /config/geoip2db /var/lib/libmaxminddb
13+
fi
1214
# check GeoIP2 database
13-
if [ -n "$MAXMINDDB_LICENSE_KEY" ]; then
15+
if [[ -n "$MAXMINDDB_LICENSE_KEY" ]]; then
1416
sed -i "s|.*MAXMINDDB_LICENSE_KEY.*|MAXMINDDB_LICENSE_KEY=\"${MAXMINDDB_LICENSE_KEY}\"|g" /etc/libmaxminddb.cron.conf
15-
if [ ! -f /var/lib/libmaxminddb/GeoLite2-City.mmdb ]; then
17+
if [[ ! -f /var/lib/libmaxminddb/GeoLite2-City.mmdb ]]; then
1618
echo "Downloading GeoIP2 City database."
1719
/etc/periodic/weekly/libmaxminddb
1820
fi
19-
elif [ -f /var/lib/libmaxminddb/GeoLite2-City.mmdb ]; then
21+
elif [[ -f /var/lib/libmaxminddb/GeoLite2-City.mmdb ]]; then
2022
echo -e "Currently using the user provided GeoLite2-City.mmdb.\nIf you want to enable weekly auto-updates of the database, retrieve a free license key from MaxMind,\nand add a new env variable \"MAXMINDDB_LICENSE_KEY\", set to your license key."
2123
else
2224
echo -e "Starting 2019/12/30, GeoIP2 databases require personal license key to download. Please retrieve a free license key from MaxMind,\nand add a new env variable \"MAXMINDDB_LICENSE_KEY\", set to your license key."
2325
fi
2426

25-
if [ ! -f /config/nginx/maxmind.conf ]; then
27+
if [[ ! -f /config/nginx/maxmind.conf ]]; then
2628
cp /defaults/maxmind.conf /config/nginx/maxmind.conf
2729
fi
2830

0 commit comments

Comments
 (0)