Add option for compose versions

.github/workflows/pr-check.yml → .github/workflows/pr-check-3.35.yml

@@ -1,4 +1,4 @@
-name: GlueTransPia PR Check
+name: GlueTransPia PR Check v3.35
 on:
   push:
     branches:
@@ -40,4 +40,4 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Build env and run tests
-      run: make pr-test
+      run: make GLUETUN_VERSION=v3.35 pr-test

.github/workflows/pr-check-latest.yml

@@ -0,0 +1,43 @@
+name: GlueTransPia PR Check v3.35
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+    types:
+      - opened
+      - reopened
+      - edited
+      - synchronize
+  workflow_dispatch:
+
+jobs:
+  lint-docker:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: hadolint/[email protected]
+        with:
+          dockerfile: Dockerfile
+  lint-sh:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ludeeus/[email protected]
+  pr-check:
+    runs-on: ubuntu-latest
+    env:
+      GLUETRANSPIA_PIAVPN_USERNAME: ${{ secrets.GLUETRANSPIA_PIAVPN_USERNAME }}
+      GLUETRANSPIA_PIAVPN_PASSWORD: ${{ secrets.GLUETRANSPIA_PIAVPN_PASSWORD }}
+      GLUETRANSPIA_PIAVPN_REGIONS: ${{ secrets.GLUETRANSPIA_PIAVPN_REGIONS }}
+      GLUETRANSPIA_TRANSMISSION_USERNAME: ${{ secrets.GLUETRANSPIA_TRANSMISSION_USERNAME }}
+      GLUETRANSPIA_TRANSMISSION_PASSWORD: ${{ secrets.GLUETRANSPIA_TRANSMISSION_PASSWORD }}
+      GLUETRANSPIA_SONAR_ORGANIZATION: ${{ secrets.GLUETRANSPIA_SONAR_ORGANIZATION }}
+      GLUETRANSPIA_SONAR_PROJECT_KEY: ${{ secrets.GLUETRANSPIA_SONAR_PROJECT_KEY }}
+      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build env and run tests
+      run: make GLUETUN_VERSION=latest pr-test

Makefile

@@ -4,6 +4,9 @@ GHCR_REPO := ghcr.io/miklosbagi/gluetranspia
 DOCKER_BUILD_CMD := docker buildx build --platform linux/amd64,linux/arm64
 DOCKER_COMPOSE_CMD := docker-compose -f test/docker-compose-build.yaml
 
+GLUETUN_VERSION := v3.36.0
+TRANSMISSION_VERSION := 4.0.4
+
 GLUETRANSPIA_PIAVPN_USERNAME := $(shell echo $$GLUETRANSPIA_PIAVPN_USERNAME)
 include test/.env
 export

test/docker-compose-build.yaml

@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   gluetun:
-    image: qmcgaw/gluetun:v3.35.0
+    image: qmcgaw/gluetun:${GLUETUN_VERSION}
     cap_add:
       - NET_ADMIN
     ports:
@@ -18,7 +18,7 @@ services:
     restart: unless-stopped
 
   transmission:
-    image: linuxserver/transmission:4.0.4
+    image: linuxserver/transmission:${TRANSMISSION_VERSION}
     environment:
       USER: ${TEST_T_USER}
       PASS: ${TEST_T_PASS}