From e01ec1e75e8ed04144dab79b0334d10959790e9a Mon Sep 17 00:00:00 2001 From: Paul <22284856+ProgramComputer@users.noreply.github.com> Date: Sat, 30 Dec 2023 22:41:04 -0600 Subject: [PATCH] Patch 6 (#6) * Code clean-up with the audio controller. Remove the unitended declaration of global variables. * Refactor audio_controller in object namespace style. Backward compatibility is kept. * Fixes #138: changing audio speed was partially broken. * Replaces calls to global audio functions by the new object. Removes the undocumented audio functions. * Avoid unnecessary function return type. * Fixes "text_id is unkown" on text opening. * Fixes warning on step 2 of feed wizard (related to #129) * Reorders functions to be in logical declaration order. * Code cleaning. * Refactoring jq_feedwizard as object namespace. * Synctactic sugar on jq_feedwizard.js. * Adds an helper object to avoid one-line JS. * Prettyfies JS code. * Isolates JS code in feed wizard step 3. * Use json_encode to avoid PHP incursion in JS code. Code prettyfying. * Beautify JS and avoid calls to deprecated functions. * Fixes JS errors on feeds: xPath was not set, and it was sometimes leave step 2. * Beautifies demo DB as the users has the right to see what they install. * Fix: the demo database was unreadable since last commit. restore_file is much better at parsing SQL. * Stop reading demo on errors, syntactic suger. * Better detection of file end not read. * Changes WoStatusChange to a value that doesn't need configuration change (#78). * Implementes #148: removes dead feeds from demo database. * Fixes a bug introduced in a previous commit. Signalled by @ProgramComputer. * Fixes #151: click delete on a language deletes the language. * Multi-image docker * Update docker-image.yml * Update docker-image.yml * Update docker-image.yml * Update docker-image.yml * Update docker-image.yml * Update docker-image.yml * Update docker-image.yml * Update docker-image.yml * Update docker-image.yml * Update docker-image.yml * future php platforms * less vulnerabilities for larger size * Lwt is accessed at /lwt/ https://hugofara.github.io/lwt/docs/info.html#install * Update Dockerfile * Update docker-image.yml * Update Dockerfile * Update docker-image.yml --------- Co-authored-by: HugoFara --- .github/workflows/docker-image.yml | 59 +++++++++++++++++++++++++----- Dockerfile | 3 ++ 2 files changed, 53 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 4f33787a..330be7e5 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -13,11 +13,23 @@ env: IMAGE_NAME: ${{ github.repository }} jobs: - build-and-push-image: + build-and-upload-image-to-release: permissions: write-all runs-on: ubuntu-latest strategy: fail-fast: false + + matrix: + platform: #change platform here and below if changed + - linux/amd64 + - linux/386 + - linux/arm/v5 + - linux/arm/v7 + - linux/arm64 + - linux/mips64le + - linux/ppc64le + - linux/s390x + steps: - name: Checkout repository uses: actions/checkout@v3 @@ -37,14 +49,6 @@ jobs: uses: docker/metadata-action@v4 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - - name: Build and push Docker images - uses: docker/build-push-action@v3 - with: - context: . - push: true - platforms: linux/amd64,linux/386,linux/arm/v5,linux/arm/v7,linux/arm64,linux/mips64le,linux/ppc64le,linux/s390x - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - name: Build Docker images uses: docker/build-push-action@v3 with: @@ -61,3 +65,40 @@ jobs: file: /tmp/image.tar asset_name: ${{ github.ref_name }}-${{ matrix.platform }} tag: ${{ github.ref }} + build-and-push-image: + permissions: write-all + runs-on: ubuntu-latest + strategy: + fail-fast: false + + steps: + + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Log in to the Container registry + uses: docker/login-action@v2 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v4 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + + - name: Build and push Docker images + uses: docker/build-push-action@v3 + with: + context: . + push: true + platforms: linux/amd64,linux/386,linux/arm/v5,linux/arm/v7,linux/arm64,linux/mips64le,linux/ppc64le,linux/s390x + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/Dockerfile b/Dockerfile index 093c817a..1ce001ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,6 @@ +LABEL org.opencontainers.image.source = "https://github.com/HugoFara/lwt" + + FROM php:8.1-apache-bullseye # creating config file php.ini