update ci

.woodpecker/build.yml

@@ -1,7 +1,7 @@
 variables:
   - &volumes
     - node16_cache:/root/.npm
-    - /data/deblan/deblan.io-murph:/data/deblan/deblan.io-murph
+    - /data/${CI_REPO}:/builds
 
 when:
   event: [push, pull_request, tag, manual]
@@ -67,11 +67,10 @@ steps:
     failure: ignore
 
   cache-build:
-    image: deblan/php:8.1
+    image: deblan/mage
     volumes: *volumes
     commands:
-      - apt-get update && apt-get -y install rsync
+      - cd /builds
-      - cd /data/deblan/deblan.io-murph/
       - rsync -az "$CI_WORKSPACE/" "$CI_COMMIT_SHA"
 
 services:

.woodpecker/deploy.yml

@@ -1,25 +1,25 @@
 variables:
   - &volumes
-    - /data/deblan/deblan.io-murph:/data/deblan/deblan.io-murph
+    - /data/${CI_REPO}:/builds
 
 when:
   event: [deployment]
 
+skip_clone: true
+
 steps:
   app-deploy:
-    image: deblan/php:8.1
+    image: deblan/mage
     secrets: [ssh_user, ssh_host, ssh_priv_key, app_directory]
     volumes: *volumes
     commands:
-      - apt-get update && apt-get -y install rsync openssh-client
+      - cd "/builds/$CI_COMMIT_SHA"
-      - cd "/data/deblan/deblan.io-murph/$CI_COMMIT_SHA"
       - mkdir "$HOME/.ssh"
       - echo "$SSH_PRIV_KEY" > "$HOME/.ssh/id_ed25519"
       - chmod 700 "$HOME/.ssh"
       - chmod 600 "$HOME/.ssh/id_ed25519"
-      - composer global require andres-montanez/magallanes
       - cp .mage.yml.dist .mage.yml
       - sed -i "s/ssh_user/$SSH_USER/g" .mage.yml
       - sed -i "s/ssh_host/$SSH_HOST/g" .mage.yml
       - sed -i "s#app_directory#$APP_DIRECTORY#g" .mage.yml
-      - /root/.config/composer/vendor/bin/mage deploy "$CI_BUILD_DEPLOY_TARGET"
+      - mage deploy "$CI_PIPELINE_DEPLOY_TARGET"

bin/messenger

@@ -22,7 +22,7 @@ help() {
     -l debug|info|notice|warning|error
           Debug level
 
-	-a start|stop|restart
+	-a start|stop|restart|status
 EOH
 }
 
@@ -34,52 +34,23 @@ on_interrupt() {
 }
 
 start_messenger() {
-	started=0
+	nohup php8.1 bin/console messenger:consume 2>/dev/null >/dev/null &
-	pid=
+	log -t -l notice "Started"
-
-	if [ -f "$pid_file" ]; then
-		pid="$(cat "$pid_file")"
-	fi
-
-	if [ -n "$pid" ]; then
-		if [ -d "/proc/$pid" ]; then
-			log -t -l warning "Already running"
-			started=1
-		fi
-	fi
-
-	if [ "$started" -eq 0 ]; then
-		nohup php8.1 bin/console messenger:consume 2>/dev/null >/dev/null &
-		echo -n $! > "$pid_file"
-		log -t -l notice "Started"
-	fi
 }
 
 stop_messenger() {
-	pid=
+	php8.1 bin/console messenger:stop-workers 2>/dev/null >/dev/null
+	log -t -l notice "Stopped"
+}
 
-	if [ -f "$pid_file" ]; then
+get_pid() {
-		pid="$(cat "$pid_file")"
+	pgrep -f messenger:consume
-	fi
-
-	if [ -n "$pid" ]; then
-		if [ ! -d "/proc/$pid" ]; then
-			log -t -l warning "Not started"
-		else
-			kill -9 "$pid"
-			log -t -l notice "Stopped"
-		fi
-
-		rm "$pid_file"
-	else
-		log -t -l warning "Not started"
-	fi
 }
 
 main() {
 	cd "$(dirname "0")"
 
-	pid_file=var/messenger.pid
+	ACTION=
 
 	while getopts "l:ha:" option; do
 		case "${option}" in
@@ -97,10 +68,12 @@ main() {
 	elif [ "$ACTION" = "restart" ]; then
 		stop_messenger
 		start_messenger
+	elif [ "$ACTION" = "status" ]; then
+		get_pid
+	else
+		log -l error "Action is required."
 	fi
 
-	# log [-t] [-l debug|info|notice|warning|error] message
-
 	exit 0
 }
 

templates/page/simple/projects.html.twig

@@ -13,29 +13,27 @@
         </div>
     </div>
 
-    <div class="grid grid-flow-row-dens grid-cols-12 md:p-8 gap-5">
+     <div class="grid grid-flow-row-dens grid-cols-12 md:p-8 gap-5">
-        {% for project in projects %}
+         {% for project in projects %}
-            <div class="card shadow-md col-span-12 md:col-span-6 lg:col-span-4 m-3 bg-box">
+             <div class="card shadow-md col-span-12 md:col-span-6 lg:col-span-4 m-3 bg-box">
-                <div class="card">
+                {% if project.image %}
-                    {% if project.image %}
+                    <figure>
-                        <figure>
+                        <img src="{{ asset(project.image)|imagine_filter('project_preview_filter') }}" alt="{{ project.label }}">
-                            <img src="{{ asset(project.image)|imagine_filter('project_preview_filter') }}" alt="{{ project.label }}">
+                    </figure>
-                        </figure>
+                {% endif %}
-                    {% endif %}
+                <div class="card-body">
-                    <div class="card-body">
+                    <h2 class="card-title">{{ project.label }}</h2>
-                        <h2 class="card-title">{{ project.label }}</h2>
 
-                        {{- project.description|murph_url|markdown('post') -}}
+                    {{- project.description|murph_url|markdown('post') -}}
 
-                        <div class="card-actions mt-5">
+                    <div class="card-actions mt-5">
-                            {% for link in project.links %}
+                        {% for link in project.links %}
-                                <a class="btn btn-xs" href="{{ link.url|murph_url }}" target="_blank">
+                            <a class="btn btn-xs" href="{{ link.url|murph_url }}" target="_blank">
-                                    {{- link.label -}}
+                                {{- link.label -}}
-                                </a>
+                            </a>
-                            {% endfor %}
+                        {% endfor %}
-                        </div>
+                     </div>
-                    </div>
+                 </div>
-                </div>
             </div>
         {% endfor %}
     </div>