TRY-434: queries optimization

.github/workflows/Release-default.yml

@@ -1,6 +1,6 @@
 name: (Release) Build and Push Default CompreFace version
 
-on: 
+on:
   workflow_dispatch:
     inputs:
       version:
@@ -10,31 +10,24 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-     - name: Check Out Repo 
-       uses: actions/checkout@v2
-     - name: Build images
-       env:
-         VERSION: ${{ github.event.inputs.version }}
-         APPERY_API_KEY: ${{ secrets.APPERY_API_KEY }}
-       working-directory: ./dev/
-       run: |
-         sed -i 's/registry=/registry=exadel\//g' .env
-         docker-compose build --build-arg APPERY_API_KEY=${APPERY_API_KEY}
-         sed -i 's/latest/${VERSION}/g' .env
-         docker-compose build --build-arg APPERY_API_KEY=${APPERY_API_KEY}
-         docker images
-     - name: Login to Docker Hub
-       uses: docker/login-action@v1
-       with:
-         username: ${{ secrets.DOCKER_HUB_LOGIN }}
-         password: ${{ secrets.DOCKER_HUB_PWD }}
-     - name: Push images to Docker Hub
-       working-directory: ./dev/
-       env:
-         VERSION: ${{ github.event.inputs.version }}
-       run: |
-         docker-compose push
-         sed -i 's/${VERSION}/latest/g' .env
-         docker-compose push
-
+      - name: Check Out Repo
+        uses: actions/checkout@v2
+      - name: Build images
+        env:
+          VERSION: ${{ github.event.inputs.version }}
+          #APPERY_API_KEY: ${{ secrets.APPERY_API_KEY }}
+        working-directory: ./dev/
+        run: |
+          sed -i 's/latest/${VERSION}/g' .env
+          docker-compose build
+          docker images
 
+      - name: Login to GitHub Packages
+        run: echo "${{ secrets.GH_TOKEN_WRITE_PACKAGES }}" | docker login ghcr.io -u admin-m10 --password-stdin
+
+      - name: Push images to Docker Hub
+        working-directory: ./dev/
+        env:
+          VERSION: ${{ github.event.inputs.version }}
+        run: |
+          docker-compose push

dev/.env

@@ -1,4 +1,4 @@
-registry=
+registry=ghcr.io/m10-payments/
 postgres_password=postgres
 postgres_username=postgres
 postgres_db=frs

dev/Dockerfile

@@ -1,4 +1,4 @@
-FROM maven:3.6.3-jdk-11-slim as build
+FROM maven:3.8.2-eclipse-temurin-17 AS build
 ARG ND4J_CLASSIFIER
 WORKDIR /workspace/compreface
 LABEL intermidiate_frs=true
@@ -12,14 +12,14 @@ COPY admin admin
 COPY common common
 RUN mvn package -Dmaven.test.skip=true -Dmaven.site.skip=true -Dmaven.javadoc.skip=true -Dnd4j.classifier=$ND4J_CLASSIFIER
 
-FROM openjdk:11.0.8-jre-slim as frs_core
+FROM eclipse-temurin:17-jre-focal AS frs_core
 ARG DIR=/workspace/compreface
 COPY --from=build ${DIR}/api/target/*.jar /home/app.jar
 ENTRYPOINT ["sh","-c","java $API_JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 -jar /home/app.jar"]
 
-FROM openjdk:11.0.8-jre-slim as frs_crud
+FROM eclipse-temurin:17-jre-focal AS frs_crud
 ARG DIR=/workspace/compreface
 COPY --from=build ${DIR}/admin/target/*.jar /home/app.jar
 ARG APPERY_API_KEY
 ENV APPERY_API_KEY ${APPERY_API_KEY}
-ENTRYPOINT ["sh","-c","java $ADMIN_JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 -jar /home/app.jar"]
+ENTRYPOINT ["sh","-c","java $ADMIN_JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 -jar /home/app.jar"]

dev/docker-compose.env.yml

@@ -15,9 +15,10 @@ volumes:
 services:
   compreface-fe:
     volumes:
-      - ./nginx/conf.d:/etc/nginx/conf.d:ro
-      - /etc/letsencrypt/archive/$HOSTNAME/fullchain1.pem:/etc/nginx/ssl/fullchain.pem:ro
-      - /etc/letsencrypt/archive/$HOSTNAME/privkey1.pem:/etc/nginx/ssl/privkey.pem:ro
+      - ./nginx/templates:/etc/nginx/templates:ro
+      - /etc/letsencrypt:/etc/letsencrypt:ro
+    environment:
+      - NGINX_HOST=$HOSTNAME
     ports:
       - "8000:80"
       - "443:443"

dev/docker-compose.multiplatform.yml

@@ -0,0 +1,32 @@
+version: '3.4'
+
+services:
+  compreface-postgres-db:
+    build:
+      platforms:
+        - "linux/amd64"
+        - "linux/arm64"
+
+  compreface-admin:
+    build:
+      platforms:
+        - "linux/amd64"
+        - "linux/arm64"
+
+  compreface-api:
+    build:
+      platforms:
+        - "linux/amd64"
+        - "linux/arm64"
+
+  compreface-fe:
+    build:
+      platforms:
+        - "linux/amd64"
+        - "linux/arm64"
+
+  compreface-core:
+    build:
+      platforms:
+        - "linux/amd64"
+        - "linux/arm64"