diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index b971a490..0fc3110e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -2,8 +2,6 @@ name: docker on: - schedule: - - cron: 0 0 1 * * # The first of the month at 00:00 push: branches: - '**' @@ -16,6 +14,56 @@ on: jobs: docker: runs-on: ubuntu-latest + if: contains(github.event.head_commit.message, 'PUSHPROD') + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + + - name: Set up dynamic build ARGs + id: getargs + run: echo "::set-output name=version::$(cat ./stable/VERSION)" + + - name: Docker meta + id: meta + uses: docker/metadata-action@v3 + with: + # list of Docker images to use as base name for tags + images: | + jokobsk/pi.alert + # generate Docker tags based on the following events/attributes + tags: | + type=raw,value=latest + type=schedule + type=ref,event=branch + type=ref,event=pr + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}} + type=sha + + - name: Login to DockerHub + if: github.event_name != 'pull_request' + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build and push + uses: docker/build-push-action@v2 + with: + platforms: linux/amd64,linux/arm64,linux/arm/v7 + push: ${{ github.event_name != 'pull_request' }} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + docker_dev: + runs-on: ubuntu-latest + if: contains(github.event.head_commit.message, 'PUSHPROD') != 'True' steps: - name: Checkout uses: actions/checkout@v2 diff --git a/front/php/templates/language/de_de.php b/front/php/templates/language/de_de.php index ad91843a..f86b8ef8 100644 --- a/front/php/templates/language/de_de.php +++ b/front/php/templates/language/de_de.php @@ -355,6 +355,14 @@ $pia_lang['HelpFAQ_Cat_General_102_text'] = 'Prüfe im Pi.Alert verzeichnis ob d chmod -R 770 ~/pialert/db
Wenn die Datenbank danach noch immer schreibgeschützt ist, versuche eine erneute Installation, oder das Zuückspielen eines Datenbank-Backups über die Wartungsseite.'; +$pia_lang['HelpFAQ_Cat_General_102docker_head'] = '(🐳 Docker only) Database issues (AJAX errors, read-only, not found)'; +$pia_lang['HelpFAQ_Cat_General_102docker_text'] = 'Double-check you\'ve followed the dockerfile readme (most up-to-date info).

'; $pia_lang['HelpFAQ_Cat_General_103_head'] = 'Die Login-Seite erscheint nicht, auch nicht nach der Passwortänderung.'; $pia_lang['HelpFAQ_Cat_General_103_text'] = 'Neben dem Passwort, muss in der Konfigurationsdatei ~/pialert/config/pialert.conf auch der Parameter PIALERT_WEB_PROTECTION auf True gesetzt sein.'; diff --git a/front/php/templates/language/en_us.php b/front/php/templates/language/en_us.php index e7e3935d..9a24129c 100644 --- a/front/php/templates/language/en_us.php +++ b/front/php/templates/language/en_us.php @@ -370,12 +370,12 @@ $pia_lang['HelpFAQ_Cat_General_102_text'] = 'Check in the Pi.Alert directory if If the database is still read-only, try reinstalling or restoring a database backup from the maintenance page.'; $pia_lang['HelpFAQ_Cat_General_102docker_head'] = '(🐳 Docker only) Database issues (AJAX errors, read-only, not found)'; $pia_lang['HelpFAQ_Cat_General_102docker_text'] = 'Double-check you\'ve followed the dockerfile readme (most up-to-date info).

'; +
  • Download the original DB from GitHub.
    • +
  • Map the pialert.db file (⚠ not folder) from above to /home/pi/pialert/db/pialert.db (see Examples for details).
    • +
  • If facing issues (AJAX errors, can\'t write to DB, etc,) make sure permissions are set correctly, alternatively check the logs under /home/pi/pialert/log.
    • +
  • To solve permission issues you can also try to create a DB backup and then run a DB Restore via the Maintenance > Backup/Restore section.
    • +
  • If the database is in read-only mode you can solve this by setting the owner and group by executing the following command on the host system: docker exec pialert chown -R www-data:www-data /home/pi/pialert/db/pialert.db.
    • + '; $pia_lang['HelpFAQ_Cat_General_103_head'] = 'The login page does not appear, even after changing the password.'; $pia_lang['HelpFAQ_Cat_General_103_text'] = 'In addition to the password, the configuration file must contain ~/pialert/config/pialert.conf also the parameter PIALERT_WEB_PROTECTION must set to True.'; diff --git a/front/php/templates/language/es_es.php b/front/php/templates/language/es_es.php index 858221d1..ce8f836c 100644 --- a/front/php/templates/language/es_es.php +++ b/front/php/templates/language/es_es.php @@ -361,6 +361,14 @@ $pia_lang['HelpFAQ_Cat_General_102_text'] = 'Compruebe en el directorio Pi.Alert chmod -R 770 ~/pialert/db
    Si la base de datos sigue siendo de sólo lectura, intente reinstalar o restaurar una copia de seguridad de la base de datos desde la página de mantenimiento.'; +$pia_lang['HelpFAQ_Cat_General_102docker_head'] = '(🐳 Docker only) Database issues (AJAX errors, read-only, not found)'; +$pia_lang['HelpFAQ_Cat_General_102docker_text'] = 'Double-check you\'ve followed the dockerfile readme (most up-to-date info).

    '; $pia_lang['HelpFAQ_Cat_General_103_head'] = 'La página de inicio de sesión no aparece, incluso después de cambiar la contraseña.'; $pia_lang['HelpFAQ_Cat_General_103_text'] = 'Además de la contraseña, el archivo de configuración debe contener ~/pialert/config/pialert.conf además el parámetro PIALERT_WEB_PROTECTION debe ajustarse a True.';