Patch 6 (#5)

* Patch 6 (#2) * 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 HugoFara#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 HugoFara#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 (HugoFara#78). * Implementes HugoFara#148: removes dead feeds from demo database. * Fixes a bug introduced in a previous commit. Signalled by @ProgramComputer. * Fixes HugoFara#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 --------- Co-authored-by: HugoFara <[email protected]> * 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 --------- Co-authored-by: HugoFara <[email protected]>
ProgramComputer · Dec 30, 2023 · 76311e3 · 76311e3
1 parent 2fc5fab
commit 76311e3
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 14 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -13,17 +13,21 @@ env:
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
-  build-and-push-image:
+  build-and-upload-image:
     permissions: write-all
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        platform:
+        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
@@ -45,15 +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: ${{ matrix.platform }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
       - name: Build  Docker images
         uses: docker/build-push-action@v3
         with:
@@ -71,3 +66,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
@@ -1,16 +1,18 @@
-FROM php:8.1-apache-buster
+LABEL org.opencontainers.image.source = "https://github.com/HugoFara/lwt"
+
+FROM php:8.1-apache-bullseye
 
 # creating config file php.ini 
 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \
     echo 'mysqli.allow_local_infile = On' >> "$PHP_INI_DIR/php.ini"
 
 RUN docker-php-ext-install pdo pdo_mysql mysqli
 
-COPY . /var/www/html/
+COPY . /var/www/html/lwt
 
 # creating connect.inc.php
 ARG DB_HOSTNAME=db
 ARG DB_USER=root
 ARG DB_PASSWORD=root
 ARG DB_DATABASE=learning-with-texts
-RUN printf '<?php\n$server = "%s";\n$userid = "%s";\n$passwd = "%s";\n$dbname = "%s";\n?>' "$DB_HOSTNAME" "$DB_USER" "$DB_PASSWORD" "$DB_DATABASE" > /var/www/html/connect.inc.php
+RUN printf '<?php\n$server = "%s";\n$userid = "%s";\n$passwd = "%s";\n$dbname = "%s";\n?>' "$DB_HOSTNAME" "$DB_USER" "$DB_PASSWORD" "$DB_DATABASE" > /var/www/html/lwt/connect.inc.php