PS-593 Libs (#399)

* include libs directly in docker builds

.dockerignore

@@ -0,0 +1,18 @@
+**/Dockerfile
+**/.dockerignore
+**/client/build
+**/var
+**/vendor
+**/node_modules
+**/.idea
+**/.php-cs-fixer.php
+**/.php-cs-fixer.cache
+**/.php_cs.cache
+/infra
+/bin
+**/.gitignore
+**/.github
+/doc
+/report
+/tmp
+**/dist

.github/workflows/build.yaml

@@ -35,12 +35,6 @@ jobs:
       - 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: Log in to the Container registry
         uses: docker/login-action@v2
         with:
@@ -51,7 +45,7 @@ jobs:
       - name: Build and Push
         uses: docker/build-push-action@v4
         with:
-          context: ${{ inputs.context }}
+          context: ${{ inputs.withLibs && './' || inputs.context }}
           file: ${{ inputs.context }}/Dockerfile
           target: ${{ inputs.target }}
           push: true

.github/workflows/build_api.yaml

@@ -31,12 +31,6 @@ jobs:
       - 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: Log in to the Container registry
         uses: docker/login-action@v2
         with:
@@ -47,7 +41,7 @@ jobs:
       - name: Build and Push API PHP
         uses: docker/build-push-action@v4
         with:
-          context: ${{ inputs.context }}
+          context: ${{ inputs.withLibs && './' || inputs.context }}
           file: ${{ inputs.context }}/Dockerfile
           target: api-php
           push: true
@@ -63,7 +57,7 @@ jobs:
       - name: Build and Push API NGINX
         uses: docker/build-push-action@v4
         with:
-          context: ${{ inputs.context }}
+          context: ${{ inputs.withLibs && './' || inputs.context }}
           file: ${{ inputs.context }}/Dockerfile
           target: api-nginx
           push: true
@@ -78,7 +72,7 @@ jobs:
       - name: Build and Push Worker
         uses: docker/build-push-action@v4
         with:
-          context: ${{ inputs.context }}
+          context: ${{ inputs.withLibs && './' || inputs.context }}
           file: ${{ inputs.context }}/Dockerfile
           target: worker
           push: true

.gitignore

@@ -2,3 +2,6 @@
 /env.local
 /.env.local
 /tmp
+.turbo
+.pnpm-store
+node_modules

.npmrc

@@ -0,0 +1 @@
+enable-pre-post-scripts=true

.prettierrc.js

@@ -0,0 +1,17 @@
+module.exports = {
+    "trailingComma": "es5",
+    "arrowParens": "avoid",
+    "bracketSpacing": false,
+    "quoteProps": "consistent",
+    "tabWidth": 4,
+    "semi": true,
+    "singleQuote": true,
+    "overrides": [
+        {
+            "files": "*.json",
+            "options": {
+                "tabWidth": 2
+            }
+        }
+    ]
+}

bin/build.sh

@@ -6,7 +6,5 @@ set -e
 
 load-env
 
-$(dirname $0)/update-libs.sh
-
 docker compose -f docker-compose.init.yml build
 docker compose build

bin/ops/configurator-migrate.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+set -e
+
+function echo_usage() {
+    echo "Usage:"
+    echo "  $0 <namespace> <migration-name>"
+}
+
+if [ -z "$1" ]; then
+  echo "Missing Kubernetes namespace."
+  echo_usage
+  exit 1
+fi
+
+if [ -z "$2" ]; then
+  echo "Missing migration name."
+  echo_usage
+  exit 1
+fi
+
+if [ -z "$3" ]; then
+  echo "Missing HELM release."
+  echo_usage
+  exit 1
+fi
+
+NS="${1}"
+MIGRATION_NAME="${2}"
+RELEASE_NAME=phrasea
+RELEASE_VERSION="${3}"
+
+echo "Migrating..."
+
+helm -n ${NS} get values ${RELEASE_NAME} -o yaml > /tmp/.current-values.yaml
+
+helm pull https://github.com/alchemy-fr/alchemy-helm-charts-repo/releases/download/phrasea-${RELEASE_VERSION}/phrasea-${RELEASE_VERSION}.tgz
+
+echo "Executing migrations..."
+helm -n ${NS} upgrade ${RELEASE_NAME} ./phrasea-${RELEASE_VERSION}.tgz \
+    -f /tmp/.current-values.yaml \
+    --set "configurator.executeMigration=${MIGRATION_NAME}"

bin/ops/db/db.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 
 DATABASES="
+auth
 databox
 expose
 uploader

bin/ops/export-all-k8s.sh

@@ -57,7 +57,13 @@ kubectl -n $NS wait --for=condition=Ready pod/${POD}
 
 for d in ${DATABASES}; do
   DUMP_FILE="${DIR}/${d}.sql"
-  APP_POD=$(kubectl -n $NS get pod -l tier=${d}-api-php -o jsonpath="{.items[0].metadata.name}") || continue
+
+  dpod="$d"
+  if [ "$dpod" = "upload" ]; then
+    dpod="uploader"
+  fi
+
+  APP_POD=$(kubectl -n $NS get pod -l tier=${dpod}-api-php -o jsonpath="{.items[0].metadata.name}") || continue
   DB_NAME=$(kubectl -n $NS exec ${APP_POD} -- /bin/ash -c 'echo $DB_NAME')
   if [ -z "${DB_NAME}" ]; then
     DB_NAME="${d}"
@@ -71,7 +77,7 @@ done
 kubectl -n $NS delete pod ${POD} --force 2> /dev/null
 
 echo "Packaging export..."
-PACKAGE_NAME="phrasea-${DATE}.tar.gz"
+PACKAGE_NAME="phrasea-${NS}-${DATE}.tar.gz"
 PACKAGE="$(realpath "${BASE_DIR}/${PACKAGE_NAME}")"
 tar -C ${DIR} -czf ${PACKAGE} ${EXPORTED}
 rm -r ${DIR}

bin/ops/import-all-k8s.sh

@@ -106,7 +106,12 @@ for d in ${DATABASES}; do
     continue
   fi
 
-  APP_POD=$(kubectl -n $NS get pod -l tier=${d}-api-php -o jsonpath="{.items[0].metadata.name}")
+  dpod="$d"
+  if [ "$dpod" = "upload" ]; then
+    dpod="uploader"
+  fi
+
+  APP_POD=$(kubectl -n $NS get pod -l tier=${dpod}-api-php -o jsonpath="{.items[0].metadata.name}")
   DB_NAME=$(kubectl -n $NS exec ${APP_POD} -- /bin/ash -c 'echo $DB_NAME')
   CONN_ARGS="-U ${DB_USER} --host ${DB_HOST} --port ${DB_PORT} ${DB_NAME}"