Merge de8f00749e into a350ff870a

* ci(actions): try using docker/build-push-action

no pushes yet ofc

* ci(actions): try using multilines to provide env vars

* ci(actions): use full form env vars providing

* ci(actions): try load flag

* ci(actions): add uploading of built images as artifacts

* ci(actions): use oci export type

* ci(actions): try generating metadata with docker/metadata-action@v5

* ci(actions): individual tagging policy fo db images

* ci(actions): improve prefixes for db images

* ci: use matrix for different platforms

* ci(actions): move DB images building to a different job

* ci(actions): add labels to images

* ci(actions): add running on pull_requests

* ci(actions): return pushing to registry

.github/workflows/build.yaml

@@ -1,14 +1,6 @@
 name: Build images
 
-on:
-  push:
-    # Publish `master` as Docker `latest` image.
-    branches:
-      - master
-
-    # Publish `v1.2.3` tags as releases.
-    tags:
-      - v*
+on: [push, pull_request]
 
 env:
   BASE_IMAGE_NAME: openvk
@@ -17,24 +9,21 @@ env:
   DB_VERSION: "10.9"
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
+  buildbase:
+    name: Build base images
     strategy:
       matrix:
-        arch: ['x86_64']
+        platform: [amd64, arm64]
+
+    runs-on: ubuntu-latest
 
-    if: github.event_name == 'push'
     steps:
-      - uses: actions/checkout@v3
-        with:
-          lfs: false
-      
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Change repository string to lowercase
         id: repositorystring
@@ -42,29 +31,114 @@ jobs:
         with:
           string: ${{ github.repository }}
 
+      - name: Base image meta
+        id: basemeta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ghcr.io/${{ steps.repositorystring.outputs.lowercase }}/${{env.BASE_IMAGE_NAME}}
+          labels: |
+            org.opencontainers.image.documentation=https://github.com/OpenVK/openvk/blob/master/install/automated/docker/Readme.md
+          tags: |
+            type=sha
+            type=ref,event=branch
+            type=ref,event=pr
+            type=ref,event=tag
+            type=raw,value=latest,enable={{is_default_branch}}
+
       - name: Log into registry
+        if: github.event_name != 'pull_request'
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
       - name: Build base image
-        run: |
-          IMAGE_ID=ghcr.io/${{ steps.repositorystring.outputs.lowercase }}/$BASE_IMAGE_NAME
-          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
-          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
-          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
-          [ "$VERSION" == "master" ] && VERSION=latest
-          echo IMAGE_ID=$IMAGE_ID
-          echo VERSION=$VERSION
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/${{matrix.platform}}
+          file: install/automated/docker/openvk.Dockerfile
+          tags: ${{ steps.basemeta.outputs.tags }}
+          labels: ${{ steps.basemeta.outputs.labels }}
+          push: ${{ github.event_name != 'pull_request' }}
+          build-args: |
+            GITREPO=${{ steps.repositorystring.outputs.lowercase }}
 
-          docker buildx build --platform linux/amd64,linux/arm64 -t $IMAGE_ID:$VERSION . --push -f install/automated/docker/openvk.Dockerfile --build-arg GITREPO=${{ steps.repositorystring.outputs.lowercase }}
+  builddb:
+    name: Build DB images
+    strategy:
+      matrix:
+        platform: [amd64, arm64]
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Change repository string to lowercase
+        id: repositorystring
+        uses: Entepotenz/change-string-case-action-min-dependencies@v1.1.0
+        with:
+          string: ${{ github.repository }}
+
+      - name: MariaDB primary meta
+        id: db-primarymeta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ghcr.io/${{ steps.repositorystring.outputs.lowercase }}/${{env.DB_IMAGE_NAME}}
+          labels: |
+            org.opencontainers.image.title=OpenVK MariaDB (Primary)
+            org.opencontainers.image.description=OpenVK's image for MariaDB for primary database.
+            org.opencontainers.image.documentation=https://github.com/OpenVK/openvk/blob/master/install/automated/docker/Readme.md
+          tags: |
+            type=sha,prefix=${{env.DB_VERSION}}-primary-sha-
+            type=ref,event=branch,prefix=${{env.DB_VERSION}}-primary-
+            type=ref,event=pr,prefix=${{env.DB_VERSION}}-primary-pr-
+            type=ref,event=tag,prefix=${{env.DB_VERSION}}-primary-
+            type=raw,value=${{env.DB_VERSION}}-primary,enable={{is_default_branch}}
+
+      - name: MariaDB event meta
+        id: db-eventmeta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ghcr.io/${{ steps.repositorystring.outputs.lowercase }}/${{env.DB_IMAGE_NAME}}
+          labels: |
+            org.opencontainers.image.title=OpenVK MariaDB (EventDB)
+            org.opencontainers.image.description=OpenVK's image for MariaDB for event database.
+            org.opencontainers.image.documentation=https://github.com/OpenVK/openvk/blob/master/install/automated/docker/Readme.md
+          tags: |
+            type=sha,prefix=${{env.DB_VERSION}}-eventdb-sha-
+            type=ref,event=branch,prefix=${{env.DB_VERSION}}-eventdb-
+            type=ref,event=pr,prefix=${{env.DB_VERSION}}-eventdb-pr-
+            type=ref,event=tag,prefix=${{env.DB_VERSION}}-eventdb-
+            type=raw,value=${{env.DB_VERSION}}-eventdb,enable={{is_default_branch}}
+
+      - name: Log into registry
+        if: github.event_name != 'pull_request'
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
       
       - name: Build MariaDB primary image
-        run: |
-          IMAGE_NAME=ghcr.io/${{ steps.repositorystring.outputs.lowercase }}/$DB_IMAGE_NAME:$DB_VERSION-primary
-
-          docker buildx build --platform linux/amd64,linux/arm64 -t $IMAGE_NAME . --push -f install/automated/docker/mariadb-primary.Dockerfile --build-arg VERSION=$DB_VERSION
+        uses: docker/build-push-action@v6
+        with:
+          push: ${{ github.event_name != 'pull_request' }}
+          platforms: linux/${{matrix.platform}}
+          file: install/automated/docker/mariadb-primary.Dockerfile
+          tags: ${{ steps.db-primarymeta.outputs.tags }}
+          labels: ${{ steps.db-primarymeta.outputs.labels }}
+          build-args: |
+            VERSION=${{env.DB_VERSION}}
       
       - name: Build MariaDB event image
-        run: |
-          IMAGE_NAME=ghcr.io/${{ steps.repositorystring.outputs.lowercase }}/$EVENT_IMAGE_NAME:$DB_VERSION-eventdb
-
-          docker buildx build --platform linux/amd64,linux/arm64 -t $IMAGE_NAME . --push -f install/automated/docker/mariadb-eventdb.Dockerfile --build-arg VERSION=$DB_VERSION
+        uses: docker/build-push-action@v6
+        with:
+          push: ${{ github.event_name != 'pull_request' }}
+          platforms: linux/${{matrix.platform}}
+          file: install/automated/docker/mariadb-eventdb.Dockerfile
+          tags: ${{ steps.db-eventmeta.outputs.tags }}
+          labels: ${{ steps.db-eventmeta.outputs.labels }}
+          build-args: |
+            VERSION=${{env.DB_VERSION}}

install/automated/docker/Readme.md

@@ -30,7 +30,7 @@ docker build -t ghcr.io/openvk/openvk/php:8.2-apache ../../.. -f base-php-apache
 DB images:
 ```
 docker build -t ghcr.io/openvk/openvk/mariadb:10.9-primary ../../.. -f mariadb-primary.Dockerfile
-docker build -t ghcr.io/openvk/openvk/mariadb:10.9-eventdb ../../.. --f mariadb-eventdb.Dockerfile
+docker build -t ghcr.io/openvk/openvk/mariadb:10.9-eventdb ../../.. -f mariadb-eventdb.Dockerfile
 ```
 OpenVK main image:
 ```

locales/en.strings

@@ -2082,7 +2082,7 @@
 "showing_x_y" = "(showing $1—$2)";
 "no_results_by_this_query" = "Nothing was found by this query.";
 "s_additional" = "Additional";
-"s_it_is_you" = "it is you";
+"s_it_is_you" = "that's you";
 
 /* BadBrowser */
 

locales/list.yml

@@ -13,7 +13,7 @@ list:
     flag: "ua"
     name: "Ukrainian"
     native_name: "Українcька"
-    author: "Aqukie (yaroslav.bielograd@ukr.net), Andrej Lenťaj, Maxim Hrabovi (dechioyo) and Kirill (mbsoft)"
+    author: "Jaroslav (ovk.to/id6908), Andrej Lenťaj, Maxim Hrabovi (dechioyo) and Kirill (mbsoft)"
   - code: "by"
     flag: "by"
     name: "Belarussian"

locales/uk.strings

@@ -315,7 +315,7 @@
 "group_managers" = "Керівництво";
 "group_type" = "Тип спільноти";
 "group_type_open" = "Це відкрита спільнота. В неї може вступити будь-хто охочий.";
-"group_type_closed" = "Це закрита спільноа. Для вступу необхідно подати заявку.";
+"group_type_closed" = "Це закрита спільнота. Для вступу необхідно подати заявку.";
 "creator" = "Автор";
 "administrators" = "Адміністратори";
 "add_to_left_menu" = "Додати до лівого меню";
@@ -343,14 +343,14 @@
 "suggest_new" = "Запропонувати новину";
 "suggested_by_you_zero" = "$1 запропонованих вами дописів";
 "suggested_by_you_one" = "Один запропонований вами допис";
-"suggested_by_you_few" = $1 запропоновані вами дописи”;
-"suggested_by_you_many" = "$1 запропонованих вами дописів”;
-"suggested_by_you_other" = "$1 запропонованих вами дописів”;
-"suggested_by_everyone_zero" = "$1 запропонованих дописів”;
-"suggested_by_everyone_one" = "Один запропонований допис”;
-"suggested_by_everyone_few" = "$1 запропоновані дописи”;
-"suggested_by_everyone_many" = "$1 запропонованих дописів”;
-"suggested_by_everyone_other" = "$1 запропонованих дописів”;
+"suggested_by_you_few" = "$1 запропоновані вами дописи";
+"suggested_by_you_many" = "$1 запропонованих вами дописів";
+"suggested_by_you_other" = "$1 запропонованих вами дописів";
+"suggested_by_everyone_zero" = "$1 запропонованих дописів";
+"suggested_by_everyone_one" = "Один запропонований допис";
+"suggested_by_everyone_few" = "$1 запропоновані дописи";
+"suggested_by_everyone_many" = "$1 запропонованих дописів";
+"suggested_by_everyone_other" = "$1 запропонованих дописів";
 "group_hide_from_global_feed" = "Не відображати дописи в глобальній стрічці";
 "suggested_posts_by_you" = "Запропоновані вами дописи";
 "suggested_posts_by_everyone" = "Запропоновані дописи";
@@ -455,7 +455,7 @@
 "webcam_avatar" = "Якщо ваш комп'ютер має камерою, Ви можете <a id='_takeSelfie'>зробити миттєву фотографію</a>";
 "publish_on_wall" = "Опублікувати допис на стіні";
 "take_snapshot" = "Зробити знімок";
-"your_browser_doesnt_support_webcam" = "Ваш браузер не підтримує знімання відео з камери."
+"your_browser_doesnt_support_webcam" = "Ваш браузер не підтримує знімання відео з камери.";
 "selected_area_user" = "Обрана область буде відображатися на вашій сторінці.";
 "selected_area_club" = "Обрана область буде показуватися на сторінці спільноти.";
 "selected_area_rotate" = "Якщо орієнтація зображення неправильна, фотографію можна повернути.";
@@ -1363,7 +1363,7 @@
 
 "invalid_club" = "Ця спільнота не існує.";
 "invalid_user" = "Цього користувача не існує.";
-"ignored_sources_limit" = "Перевищено ліміт ігнорованих джерел.";
+"ignored_sources_limit" = "Досягнуто ліміт ігнорованих джерел.";
 
 "invalid_audio" = "Пошкоджене аудіо.";
 "do_not_have_audio" = "У вас немає цього аудіо";
@@ -1439,6 +1439,8 @@
 "error_max_pinned_clubs" = "Знаходитись у лівому меню можуть максимум 10 спільнот";
 "error_viewing_subs" = "Ви не можете переглядати лист підписок $1.";
 "error_status_too_long" = "Статус надто довгий ($1 символів замість 255 символів)";
+"death" = "Смерть...";
+"nehay" = "Нехай живе";
 "user_successfully_banned" = "Користувача успішно заблоковано.";
 
 "content_is_deleted" = "Коментар видалено, а користувач отримав попередження.";

themepacks/midnight/res/xmas.css

@@ -1,7 +1,7 @@
 .page_header {
-    background-image: url('/themepack/midnight/0.0.3.0/resource/xheader.png') !important;
+    background-image: url('/themepack/midnight/0.0.3.1/resource/xheader.png') !important;
 }
 
 .page_custom_header {
-    background-image: url('/themepack/midnight/0.0.3.0/resource/xheader_custom.png') !important;
+    background-image: url('/themepack/midnight/0.0.3.1/resource/xheader_custom.png') !important;
 }

themepacks/midnight/stylesheet.css

@@ -186,8 +186,12 @@ hr {
 .menu_divider,
 .ovk-diag-action,
 .minilink .counter,
-.topGrayBlock {
-    background-color: #2c2640;
+.topGrayBlock,
+.showMore,
+.showMoreAudiosPlaylist,
+#showMorePhotos,
+#showMoreVideos {
+    background-color: #2c2640 !important;
 }
 
 .bsdn_contextMenu {
@@ -313,11 +317,11 @@ tr.v,
 }
 
 .content_title_expanded {
-    background-image: url("/themepack/midnight/0.0.3.0/resource/flex_arrow_open.png") !important;
+    background-image: url("/themepack/midnight/0.0.3.1/resource/flex_arrow_open.png") !important;
 }
 
 .content_title_unexpanded {
-    background-image: url("/themepack/midnight/0.0.3.0/resource/flex_arrow_shut.gif") !important;
+    background-image: url("/themepack/midnight/0.0.3.1/resource/flex_arrow_shut.gif") !important;
 }
 
 .ovk-video>.preview,
@@ -344,17 +348,17 @@ tr.h {
 
 .page_yellowheader {
     color: #c6d2e8;
-    background-image: url("/themepack/midnight/0.0.3.0/resource/header_purple.png") !important;
+    background-image: url("/themepack/midnight/0.0.3.1/resource/header_purple.png") !important;
     background-color: #231f34;
     border-color: #231f34;
 }
 
 .page_header {
-    background-image: url("/themepack/midnight/0.0.3.0/resource/header.png") !important;
+    background-image: url("/themepack/midnight/0.0.3.1/resource/header.png") !important;
 }
 
 .page_custom_header {
-    background-image: url("/themepack/midnight/0.0.3.0/resource/header_custom.png") !important;
+    background-image: url("/themepack/midnight/0.0.3.1/resource/header_custom.png") !important;
 }
 
 .page_yellowheader span,
@@ -392,11 +396,11 @@ select,
 }
 
 input[type="checkbox"] {
-    background-image: url("/themepack/midnight/0.0.3.0/resource/checkbox.png") !important;
+    background-image: url("/themepack/midnight/0.0.3.1/resource/checkbox.png") !important;
 }
 
 input[type="radio"] {
-    background-image: url("/themepack/midnight/0.0.3.0/resource/radio.png") !important;
+    background-image: url("/themepack/midnight/0.0.3.1/resource/radio.png") !important;
 }
 
 .header_navigation .link, .header_navigation .header_divider_stick {
@@ -404,20 +408,20 @@ input[type="radio"] {
 }
 
 .heart {
-    background-image: url("/themepack/midnight/0.0.3.0/resource/like.gif") !important;
+    background-image: url("/themepack/midnight/0.0.3.1/resource/like.gif") !important;
 }
 
 .pinned-mark,
 .post-author .pin {
-    background-image: url("/themepack/midnight/0.0.3.0/resource/pin.png") !important;
+    background-image: url("/themepack/midnight/0.0.3.1/resource/pin.png") !important;
 }
 
 .repost-icon {
-    background-image: url("/themepack/midnight/0.0.3.0/resource/published.gif") !important;
+    background-image: url("/themepack/midnight/0.0.3.1/resource/published.gif") !important;
 }
 
 .post-author .delete {
-    background-image: url("/themepack/midnight/0.0.3.0/resource/input_clear.gif") !important;
+    background-image: url("/themepack/midnight/0.0.3.1/resource/input_clear.gif") !important;
 }
 
 .user-alert {
@@ -450,7 +454,7 @@ input[type="radio"] {
 }
 
 #backdropEditor {
-    background-image: url("/themepack/midnight/0.0.3.0/resource/backdrop-editor.gif") !important;
+    background-image: url("/themepack/midnight/0.0.3.1/resource/backdrop-editor.gif") !important;
     border-color: #473e66 !important;
 }
 
@@ -588,11 +592,6 @@ ul {
     cursor: pointer;
 }
 
-.showMore,
-.showMoreAudiosPlaylist {
-    background: #181826 !important;
-}
-
 /* Tour */
 .rightNav h1 {
     background: #000;

themepacks/midnight/theme.yml

@@ -1,5 +1,5 @@
 id: midnight
-version: "0.0.3.0"
+version: "0.0.3.1"
 openvk_version: 0
 enabled: 1
 metadata: