demo housekeeping updates (#61)

* update entire setup

* use docker system prune

* s/docker compose rm/docker compose down/g

* update stop scripts

* update Docker Compose network settings

README.md

@@ -80,8 +80,8 @@ Have Ansible, Vagrant and VBox installed.
 
 # Setup Vagrant with VirtualBox for Ubuntu 16.04 VM
 cd demo.pygeoapi.io
-vagrant box add geerlingguy/ubuntu1604
-vagrant init geerlingguy/ubuntu1604
+vagrant box add geerlingguy/ubuntu2404
+vagrant init geerlingguy/ubuntu2404
 
 # Will use Vagrantfile for auto-provisioning via Ansible
 vagrant up

Vagrantfile

@@ -12,7 +12,7 @@ Vagrant.configure("2") do |config|
 
   # Every Vagrant development environment requires a box. You can search for
   # boxes at https://vagrantcloud.com/search.
-  config.vm.box = "geerlingguy/ubuntu1604"
+  config.vm.box = "geerlingguy/ubuntu2404"
 
   # Disable automatic box update checking. If you disable this, then
   # boxes will only be checked for updates when the user runs

ansible/bootstrap.yml

@@ -1,5 +1,5 @@
 # Inspired from https://github.com/5car1z/ansible-debian-provisioning
-- name: "PyGeoAPI Ubuntu Server Setup"
+- name: "pygeoapi Ubuntu Server Setup"
   hosts: all
   become: true
   gather_facts: yes
@@ -54,5 +54,5 @@
       shell: "cd {{ platform_home }}; ./build.sh"
       become_user: "{{ my_admin_user }}"
 
-    - name: "Install PyGeoAPI System Service"
+    - name: "Install pygeoapi System Service"
       shell: "{{ platform_home }}/install.sh"

ansible/requirements.yml

@@ -3,18 +3,18 @@
   version: v2.0.5
 
 - src: oefenweb.postfix
-  version: v2.7.0
+  version: v3.7.3
 
 - src: geerlingguy.pip
-  version: 1.3.0
+  version: 3.1.0
 
 - src: geerlingguy.docker
-  version: 2.5.2
+  version: 7.4.4
 
 # from GitHub
 - src: https://github.com/justb4/ansible-ubuntu-base
   name: justb4.ubuntu-base
-  version: v1.2
+  version: v1.4
 
 - src: https://github.com/justb4/ansible-ubuntu-ntp
   name: justb4.ubuntu-ntp

services/dockerhub/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
 
   #  See https://github.com/maccyber/micro-dockerhub-hook
@@ -26,7 +24,7 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - ./scripts:/src/scripts
-      # Paths to docker-compose files who are triggered by scripts:
+      # Paths to docker compose files who are triggered by scripts:
       - ./../pygeoapi_master:/srv/pygeoapi_master
       - ./../home:/srv/home
       - ./../pygeoapi_cite:/srv/pygeoapi_cite
@@ -35,5 +33,5 @@ services:
 
 networks:
   default:
-    external:
-      name: pygeoapi-network
+    name: pygeoapi-network
+    external: true

services/dockerhub/scripts/home.update.sh

@@ -2,8 +2,8 @@
 
 echo "Updating pygeoapi home..."
 
-cd /srv/home && ./stop.sh && docker pull geopython/demo.pygeoapi.io:latest && docker-compose up -d
+cd /srv/home && ./stop.sh && docker pull geopython/demo.pygeoapi.io:latest && docker compose up -d
 
 echo "Cleaning up..."
 
-cd /src/scripts && ./docker-clean.sh
+cd /src/scripts && docker system prune --force --volumes

services/dockerhub/scripts/pygeoapi_latest.update.sh

@@ -4,16 +4,16 @@ echo "Updating pygeoapi_master..."
 
 docker pull geopython/pygeoapi:latest
 
-cd /srv/pygeoapi_master && ./stop.sh && ./build.sh && docker-compose up -d
+cd /srv/pygeoapi_master && ./stop.sh && ./build.sh && docker compose up -d
 
 echo "Updating pygeoapi_cite..."
 
-cd /srv/pygeoapi_cite && ./stop.sh && ./build.sh && docker-compose up -d
+cd /srv/pygeoapi_cite && ./stop.sh && ./build.sh && docker compose up -d
 
 echo "Updating pygeoapi_covid-19..."
 
-cd /srv/pygeoapi_covid-19 && ./stop.sh && ./build.sh && docker-compose up -d
+cd /srv/pygeoapi_covid-19 && ./stop.sh && ./build.sh && docker compose up -d
 
 echo "Cleaning up..."
 
-cd /src/scripts && ./docker-clean.sh
+cd /src/scripts && docker system prune --force --volumes

services/dockerhub/start.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 ./stop.sh
-docker-compose up -d
+docker compose up -d

services/dockerhub/stop.sh

@@ -1,4 +1,3 @@
 #!/bin/bash
 
-docker-compose stop
-docker-compose rm --force
+docker compose down --remove-orphans

services/home/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.6.7-alpine3.8
+FROM python:3.11-alpine3.21
 
 LABEL maintainer="Just van den Broecke <[email protected]>"