Merge branch 'master' into PS_557-metadata-documentation

.env

@@ -1,6 +1,6 @@
 COMPOSE_PROJECT_NAME=ps
-COMPOSE_FILE=docker-compose.yml:docker-compose.prod.yml
-COMPOSE_PROFILES=db,uploader,auth,databox,expose,report,notify,tools,mailhog,dashboard
+COMPOSE_FILE=docker-compose.yml
+COMPOSE_PROFILES=auth,databox,expose,notify,uploader,auth-worker,databox-worker,expose-worker,notify-worker,uploader-worker,db,report,tools,mailhog,dashboard
 
 # Leave empty if 443, include ':' otherwise
 HTTPS_PORT_PREFIX=
@@ -64,6 +64,9 @@ DATABOX_CLOUD_FRONT_PRIVATE_KEY=
 DATABOX_CLOUD_FRONT_KEY_PAIR_ID=
 DATABOX_CLOUD_FRONT_TTL=86400
 
+DATABOX_SECRETS_PUBLIC_KEY=j0J1OtLTd78OVhVMEQwd+98EusYkAdN8VNhHIENLlWI=
+DATABOX_SECRETS_SECRET_KEY=Y6cqN347d5ShtLCmR3DGE+A2Z+SBw4S1wOTTFrISF3M=
+
 # OAuth client ID for Databox service
 DATABOX_CLIENT_ID=databox-app
 # OAuth client secret for Databox service (left part)
@@ -183,16 +186,16 @@ ZIPPY_CLIENT_ID=client
 ZIPPY_CLIENT_SECRET=secret
 
 # SAML IDP Test 1
-SAML_BASE_URL=https://saml-idp.phrasea.local/simplesaml
+SAML_BASE_URL=https://saml-idp.${PHRASEA_DOMAIN:-"phrasea.local"}/simplesaml
 # SAML IDP Test 2
-SAML2_BASE_URL=https://saml-idp2.phrasea.local/simplesaml
+SAML2_BASE_URL=https://saml-idp2.${PHRASEA_DOMAIN:-"phrasea.local"}/simplesaml
 
 TRUSTED_PROXIES=127.0.0.1,REMOTE_ADDR
 PS_SUBNET=172.30.202.0/16
 PS_GATEWAY_IP=172.30.0.1
 
 # Xdebug
-IDE_KEY=PHPSTORM
+XDEBUG_SESSION=PHPSTORM
 XDEBUG_ENABLED=0
 PS_DEBUG_SERVER_NAME_PREFIX=docker-server-
 
@@ -208,7 +211,7 @@ ELK_VERSION=7.11.2
 
 VERIFY_SSL=true
 
-PHRASEANET_BASE_URL=https://phraseanet.phrasea.local
+PHRASEANET_BASE_URL=https://phraseanet.${PHRASEA_DOMAIN:-"phrasea.local"}
 PHRASEANET_APP_OAUTH_TOKEN=define-me
 
 # Indexer

.github/workflows/build.yaml

@@ -3,9 +3,16 @@ name: Build and push image
 on:
   workflow_call:
     inputs:
-      images:
+      image:
         required: true
         type: string
+      context:
+        required: true
+        type: string
+      target:
+        required: false
+        default: ''
+        type: string
       withLibs:
         required: false
         default: false
@@ -16,32 +23,42 @@ env:
   REGISTRY_NAMESPACE: ghcr.io/${{ github.repository_owner }}/ps-
   DOCKER_TAG: ${{ github.sha }}
   IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
-  REGISTRY_USER: ${{ github.actor }}
-  REGISTRY_PASSWORD: ${{ github.token }}
 
 jobs:
   build:
     runs-on: ubuntu-latest
     if: ${{ github.repository_owner == 'alchemy-fr' }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+
+      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-buildx-action@v2
+
       - name: Update libs
         if: ${{ inputs.withLibs }}
         shell: bash
         run: |
           bin/update-libs.sh
-      - name: Build
-        shell: bash
-        run: |
-          docker-compose build ${{ inputs.images }}
+
       - name: Log in to the Container registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ${{ env.IMAGE_REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Push
-        shell: bash
-        run: |
-          docker-compose push ${{ inputs.images }}
+
+      - name: build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: ${{ inputs.context }}
+          file: ${{ inputs.context }}/Dockerfile
+          target: ${{ inputs.target }}
+          push: true
+          cache-from: type=registry,ref=${{ env.REGISTRY_NAMESPACE }}${{ inputs.image }}:build-cache
+          cache-to: type=registry,mode=max,ref=${{ env.REGISTRY_NAMESPACE }}${{ inputs.image }}:build-cache
+          build-args: |
+            BASE_TAG=${{ env.DOCKER_TAG }}
+            REGISTRY_NAMESPACE=${{ env.REGISTRY_NAMESPACE }}
+          tags: |
+            ${{ env.REGISTRY_NAMESPACE }}${{ inputs.image }}:${{ env.DOCKER_TAG }}

.github/workflows/build_base.yaml

@@ -3,7 +3,10 @@ name: Build and push image
 on:
   workflow_call:
     inputs:
-      images:
+      image:
+        required: true
+        type: string
+      context:
         required: true
         type: string
 
@@ -12,27 +15,32 @@ env:
   REGISTRY_NAMESPACE: ghcr.io/${{ github.repository_owner }}/ps-
   DOCKER_TAG: ${{ github.sha }}
   IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
-  REGISTRY_USER: ${{ github.actor }}
-  REGISTRY_PASSWORD: ${{ github.token }}
 
 jobs:
   build:
     runs-on: ubuntu-latest
     if: ${{ github.repository_owner == 'alchemy-fr' }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Build
-        shell: bash
-        run: |
-          docker-compose -f docker-compose.init.yml build ${{ inputs.images }}
+        uses: actions/checkout@v3
+
+      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-buildx-action@v2
+
       - name: Log in to the Container registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ${{ env.IMAGE_REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Push
-        shell: bash
-        run: |
-          docker-compose -f docker-compose.init.yml push ${{ inputs.images }}
+
+      - name: build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: ${{ inputs.context }}
+          file: ${{ inputs.context }}/Dockerfile
+          push: true
+          cache-from: type=registry,ref=${{ env.REGISTRY_NAMESPACE }}${{ inputs.image }}:build-cache
+          cache-to: type=registry,mode=max,ref=${{ env.REGISTRY_NAMESPACE }}${{ inputs.image }}:build-cache
+          tags: |
+            ${{ env.REGISTRY_NAMESPACE }}${{ inputs.image }}:${{ env.DOCKER_TAG }}