2024-09-24: Updated Orchesteration labs

Author: unknown

Basic_Installation/mezzio/src/App/src/Handler/QueryHandler.php

@@ -16,6 +16,7 @@ class QueryHandler implements RequestHandlerInterface
      */
     private $renderer;
     public ?Lookup $lookup = NULL;
+    public ?Postcode $postcode = NULL;
     public function __construct(TemplateRendererInterface $renderer, Postcode $postcode)
     {
         $this->renderer = $renderer;

Basic_Installation/mezzio/src/Demo/Geonames/Base.php

@@ -12,6 +12,7 @@ class Base
     const GEONAMES_SHORT = 'cities15000short.txt';
     const GEONAMES_FILTERED = 'cities15000filtered.txt';
     const DATA_PATH      = __DIR__ . '/../../../data/';
+    public ?string $delim = NULL;
     public static $geo   = NULL;
     public static $count = 0;
     public static $geoFn = self::GEONAMES_FILTERED;

Orchestration_Labs/Orchestration_Labs_docker.zip

@@ -1,4 +1,8 @@
 FROM alpine:latest
+COPY nginx.startup.sh /usr/sbin/startup.sh
+COPY nginx.default.conf /tmp/default.conf
+COPY nginx.zendphp1.conf /tmp/nginx.zendphp1.conf
+COPY nginx.zendphp2.conf /tmp/nginx.zendphp2.conf
 RUN \
     echo "Installing basic utils ..." && \
     apk add nano && \
@@ -7,8 +11,5 @@ RUN \
     echo "Installing nginx ..." && \
     apk add nginx && \
     chown -R nginx /var/www
-COPY nginx.startup.sh /usr/sbin/startup.sh
-COPY nginx.zendphp1.conf /etc/nginx/http.d/zendphp1.conf
-COPY nginx.zendphp2.conf /etc/nginx/http.d/zendphp2.conf
 RUN chmod +x /usr/sbin/*.sh
 ENTRYPOINT /usr/sbin/startup.sh

Orchestration_Labs/docker/Dockerfile.NGINX

@@ -0,0 +1,17 @@
+server {
+    listen 80 default_server;
+    listen [::]:80 default_server;
+    root   /var/www/mezzio/public;
+
+   location / {
+        try_files $uri index.php @mezzio;
+        fastcgi_pass      10.10.70.30:9000;
+        fastcgi_index     index.php;
+        include           fastcgi.conf;
+    }
+    
+    location @mezzio {
+        rewrite /(.*)$ /index.php?/$1 last;
+    }
+
+}

Orchestration_Labs/docker/nginx.default.conf

@@ -1,4 +1,6 @@
 #!/bin/bash
+echo 'Copying config files'
+cp /tmp/*.conf /etc/nginx/http.d
 echo 'Resetting permissions'
 chown -R nginx /var/www
 chmod -R 775 /var/www

Orchestration_Labs/docker/nginx.startup.sh

@@ -1,13 +1,14 @@
 #!/usr/bin/sh
 . ../Docker/secrets.sh
-echo "Installing Podman ..."
-apt-get install -y podman
-apt-get install -y podman-compose
+echo "Installing misc tools ..." && \
+apt-get update -y
+apt-get install -y podman podman-compose
+ln -s /usr/bin/podman /usr/bin/docker
+ln -s /usr/bin/podman-compose /usr/bin/docker-compose
 echo "Assigning permissions ..."
 chmod 755 $HOME_DIR
 chown -R vagrant:www-data $HOME_DIR/*
 find $HOME_DIR/* -type f -exec chmod 664 {} \;
 find $HOME_DIR/* -type d -exec chmod 775 {} \;
-find $HOME_DIR/* -name *.sh -exec chmod 775 {} \;
 chown -R www-data:www-data /var/www
 echo "Course-specific VM setup complete ... "

VM/install_extra.sh

@@ -4,7 +4,7 @@ cd $HOME_DIR
 cd Zend
 echo "Installing misc tools ..." && \
 apt-get update -y
-apt-get install -y git net-tools docker docker-compose geany curl unzip
+apt-get install -y git net-tools git geany curl unzip
 echo "Installing database ..."
 apt-get install -y mysql-server
 /etc/init.d/mysql start