cleanup

mediawiki/docker-compose.yml

@@ -13,7 +13,7 @@ services:
     links:
       - database
     volumes:
-      - /var/www/html/images
+      - ./volumes/images:/var/www/html/images
       # After initial setup, download LocalSettings.php to the same directory as
       # this yaml and uncomment the following line and use compose to restart
       # the mediawiki service
@@ -29,3 +29,5 @@ services:
       MYSQL_USER: wikiuser
       MYSQL_PASSWORD: example
       MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
+    volumes:
+      - ./volumes/mariadb:/var/lib/mysql

portainer/docker-compose.yaml

@@ -9,5 +9,5 @@ services:
      - 8000:8000
      - 9443:9443
    volumes:
-     - ./portainer_data:/data
+     - ./volumes/data:/data
      - /var/run/docker.sock:/var/run/docker.sock

portainer/portainer_data/certs/cert.pem

@@ -1,10 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBUTCB+aADAgECAhEAzCMCoLriIwCpK0RgVPPPHjAKBggqhkjOPQQDAjAAMB4X
-DTIzMDMyOTEyMzEzMVoXDTI4MDMyOTEyMzEzMVowADBZMBMGByqGSM49AgEGCCqG
-SM49AwEHA0IABEEA1sLZGRfK6R+njkEq9LD/M41FAMI7pg/J8GDvaSexeuXh0qAL
-K4pmvBD4E4chJ0KRNjnU4whzUUEKoLRKcx6jVDBSMA4GA1UdDwEB/wQEAwIFoDAT
-BgNVHSUEDDAKBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMB0GA1UdEQEB/wQTMBGC
-CWxvY2FsaG9zdIcEAAAAADAKBggqhkjOPQQDAgNHADBEAiBXgeviCYcEiMHJPhxN
-7psUVVXHZqBt/RsaLWDEVqe5HQIgfdQoCHvcq5wUQMRF7YlrIJP20eoqqZRWDB8V
-mFAjBEU=
------END CERTIFICATE-----

portainer/portainer_data/certs/key.pem

@@ -1,5 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEINMkRbyAA37Se5V+cDZezaaqTnqQUmHu3sQdwHQbefRyoAoGCCqGSM49
-AwEHoUQDQgAEQQDWwtkZF8rpH6eOQSr0sP8zjUUAwjumD8nwYO9pJ7F65eHSoAsr
-ima8EPgThyEnQpE2OdTjCHNRQQqgtEpzHg==
------END EC PRIVATE KEY-----

portainer/portainer_data/docker_config/config.json

@@ -1 +0,0 @@
-{"HttpHeaders":{"X-PortainerAgent-ManagerOperation":"1","X-PortainerAgent-PublicKey":"3059301306072a8648ce3d020106082a8648ce3d0301070342000423ff2b462113e7f1160b2b5928fcb7592035fa30484cfffad090b78e8b61e086902b50a90caae2af5b509e7b7dadb621523c2571389873b6c785061fe575cabc","X-PortainerAgent-Signature":"fLj8HUSCLaCcOMB3KHzUldHNM23swq8vIBieHAjoVSF57u7ASFq+7J3L80WeoM2BszFYySxsziUt4WI5fCr7GQ"}}

portainer/portainer_data/portainer.key

@@ -1,5 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHyUg5CHWXExcAV5z+RPx+B0XB1FFuPrxN7eD/xBV62NoAoGCCqGSM49
-AwEHoUQDQgAEI/8rRiET5/EWCytZKPy3WSA1+jBITP/60JC3joth4IaQK1CpDKri
-r1tQnnt9rbYhUjwlcTiYc7bHhQYf5XXKvA==
------END EC PRIVATE KEY-----

portainer/portainer_data/portainer.pub

@@ -1,4 +0,0 @@
------BEGIN ECDSA PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEI/8rRiET5/EWCytZKPy3WSA1+jBI
-TP/60JC3joth4IaQK1CpDKrir1tQnnt9rbYhUjwlcTiYc7bHhQYf5XXKvA==
------END ECDSA PUBLIC KEY-----

startstop.sh

@@ -27,6 +27,20 @@ compose()
  done
 }
 
+clean()
+{
+ for STACK in $STACKS;
+ do
+   echo "Verzeichnis: $STACK"
+   if [ -e $STACK/volumes ]
+   then
+     echo "  Volumes in $STACK loeschen..."
+      rm $STACK/volumes/* -rfv
+   fi
+ done
+}
+
+
 case $1 in
 
 down)
@@ -41,8 +55,13 @@ stop)
  compose "docker compose stop"
 ;;
 
+pull)
+ compose "docker compose pull"
+;;
+
 cleanup)
-  compose "rm ./volumes/* -rf"
+  #compose "rm ./volumes/* -rf"
+  clean
 ;;
 
 *)