diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker_build_latest.yml similarity index 61% rename from .github/workflows/docker-build.yml rename to .github/workflows/docker_build_latest.yml index e45f5ea..e68fb96 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker_build_latest.yml @@ -11,21 +11,21 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 - name: Log in to Docker Hub - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and push Docker image - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v6 with: context: . - file: dockerfile # der Pfad zu deinem Dockerfile + file: dockerfile push: true - tags: dewenni/lanis:latest \ No newline at end of file + tags: ${{ github.repository_owner }}/${{ github.event.repository.name }}:latest \ No newline at end of file diff --git a/.github/workflows/docker_build_release.yml b/.github/workflows/docker_build_release.yml new file mode 100644 index 0000000..b7c7807 --- /dev/null +++ b/.github/workflows/docker_build_release.yml @@ -0,0 +1,43 @@ +name: Build and Push Docker Image - RELEASE + +on: + workflow_dispatch: + push: + tags: + - 'v*.*.*' + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Create release + id: create_release + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + tag: ${{ github.ref_name }} + run: | + gh release create "$tag" \ + --repo="$GITHUB_REPOSITORY" \ + --title="${tag}" \ + -F changeNew.md + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Build and push Docker image + uses: docker/build-push-action@v6 + with: + context: . + file: dockerfile + push: true + tags: ${{ github.repository_owner }}/${{ github.event.repository.name }}:${{ github.ref_name }} \ No newline at end of file diff --git a/.gitignore b/.gitignore index bb59854..a4222cb 100644 --- a/.gitignore +++ b/.gitignore @@ -163,3 +163,4 @@ cython_debug/ app/config/ app/output/ app/lib/lanisapi/helpers/log/html_logs.txt +session.json diff --git a/README.md b/README.md index 3558dbd..f08a07e 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ services: network_mode: host container_name: lanis environment: - - INTERVAL=60 # Zeitintervall für Abfragen in Sekunden + - INTERVAL=3600 # Zeitintervall für Abfragen in Sekunden - HTTP_PORT=4040 # Umgebungsvariable für den HTTP-Server pull_policy: always volumes: diff --git a/app/lanis.py b/app/lanis.py index ffbc97d..8dcaa69 100644 --- a/app/lanis.py +++ b/app/lanis.py @@ -23,6 +23,9 @@ def main(): # LANIS-Client erstellen client = LanisClient(LanisAccount(LANIS_SCHOOL, LANIS_USER, LANIS_PASSWORD)) + # Welcome Nachricht + sendPushover("Lanis-App", "Lanis-App ist gestartet und prüft nun regelmäßig Updates im Schulportal") + while True: retries = 3 # Maximale Anzahl der Versuche for attempt in range(retries): diff --git a/session.json b/session.json deleted file mode 100644 index afb9750..0000000 --- a/session.json +++ /dev/null @@ -1 +0,0 @@ -{"SCHOOLID": "3685", "NORMAL": {"session_id": "ul3755n6v0ivdmmeu5e5qlp80m", "timestamp": 1728747039.0798988}, "LONG": null} \ No newline at end of file