Diploi Next changes

.github/workflows/DiploiTemplateBuild.yaml

@@ -28,6 +28,9 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -42,6 +45,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
+          platforms: linux/arm64
           pull: true
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}

Dockerfile

@@ -25,7 +25,7 @@ RUN apt-get update && apt-get install -y nano supervisor openssh-server git bash
 # Install PostgreSQL client
 #RUN apt-get install -y postgresql-client
 
-RUN mkdir /run/sshd /root/.ssh \
+RUN mkdir -p /run/sshd /root/.ssh \
   && chmod 0700 /root/.ssh \
   && ssh-keygen -A \
   && sed -i s/^#PasswordAuthentication\ yes/PasswordAuthentication\ no/ /etc/ssh/sshd_config \

diploi-template.yaml

@@ -127,21 +127,21 @@ storage:
       - production
       - staging
       - development
-    sizeMb: 8000
+    sizeMiB: 2048
   - identifier: odoohome
     stages:
       - development
-    sizeMb: 8000
+    sizeMiB: 2048
   - identifier: odooaddons
     stages:
       - development
-    sizeMb: 8000
+    sizeMiB: 2048
   - identifier: postgres
     stages:
       - production
       - staging
       - development
-    sizeMb: 10000
+    sizeMiB: 4096
 
 status:
   url: http://odoo:3000/status

initialProject/.github/workflows/DiploiBuild.yaml

@@ -23,6 +23,9 @@ jobs:
         with:
           images: ${{ secrets.DIPLOI_REGISTRY_HOSTNAME }}/${{ env.IMAGE_NAME }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -37,6 +40,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
+          platforms: linux/arm64
           pull: true
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}

runonce-odoo.sh

@@ -1,15 +1,21 @@
 #!/bin/sh
 
+progress() {
+  current_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
+  local action="$1"
+  echo "🟩 $current_date $action"
+}
+
 # Perform tasks ths should run as odoo user at pod startup
-echo "Runonce odoo started";
+progress "Runonce started";
 
 cd /mnt/extra-addons;
 
 # Seems that this is first run in devel instance
 # Intialize persistant storage
 if [ ! "$(ls -A /mnt/extra-addons)" ]; then
 
-  echo "Initializing git repository"
+  progress "Pulling code";
 
   git init;
   git config credential.helper '!diploi-credential-helper';
@@ -40,9 +46,9 @@ EOL
 fi
 
 # Wait for database and initialize odoo and set admin password on first run 
-echo "Initializing odoo";
+progress "Initializing Odoo";
 python3 /odoo-init.py;
 
-echo "Runonce odoo done";
+progress "Runonce done";
 
 exit 0;

templates/odoo-ingress.yaml

@@ -4,8 +4,6 @@ metadata:
   name: ingress
   annotations:
     kubernetes.io/ingress.class: traefik
-    traefik.ingress.kubernetes.io/router.middlewares: diploi-redirect-https@kubernetescrd
-    cert-manager.io/cluster-issuer: 'letsencrypt-prod'
 spec:
   tls:
     - hosts:

templates/odoo-service.yaml

@@ -9,4 +9,4 @@ spec:
     - port: 3000
       name: status
   selector:
-    app: {{ ternary "odoo" "disabled" .Values.enabled }}
+    app: odoo