Fixes

data/composer/psc/docker-compose.yml

@@ -7,7 +7,7 @@ services:
     networks:
       - common
   mysql:
-    image: registry.gitlab.com/printshopcreator/docker/docker_mysql:latest
+    image: mariadb
     depends_on:
       - mongodb
     environment:
@@ -18,7 +18,7 @@ services:
     networks:
       - common
   cron:
-    image: registry.gitlab.com/printshopcreator/docker/docker_cron:php7
+    image: registry.thomas-peterson.de/printshopcreator/docker/php-cron-prod:2.2
     depends_on:
       - mongodb
       - mysql
@@ -42,8 +42,8 @@ services:
       - plugins:/data/www/new/var/plugins/Custom
     networks:
       - common
-  php:
-    image: registry.gitlab.com/printshopcreator/docker/docker_php:php7
+  php-fpm:
+    image: registry.thomas-peterson.de/printshopcreator/docker/php-fpm-prod:2.2
     depends_on:
       - mongodb
       - mysql
@@ -74,12 +74,8 @@ services:
       - /data/composer/psc/docker-compose.yml:/data/www/new/compose.yml
     networks:
       - common
-  tp:
-    image: registry.gitlab.com/printshopcreator/docker/docker_tp:swarm
-    networks:
-      - common
   web:
-    image: registry.gitlab.com/printshopcreator/docker/docker_web:php7_tp
+    image: registry.thomas-peterson.de/printshopcreator/docker/web-prod:2.2
     environment:
       - VIRTUAL_HOST=subdomain.domain.de
       - VIRTUAL_PORT=80
@@ -170,12 +166,6 @@ volumes:
       type: 'none'
       o: 'bind'
       device: '/data/volumes/psc/temp'
-  bundles:
-    driver: local
-    driver_opts:
-      type: 'none'
-      o: 'bind'
-      device: '/data/volumes/psc/bundles'
   market:
     driver: local
     driver_opts:

psc_suite.sh

@@ -60,13 +60,15 @@ chmod -R 0777 /data/volumes/psc/watch
 echo '/data/volumes/psc/watch/upgrade IN_MODIFY cd /data/composer/psc && docker system prune -f && docker-compose pull && docker-compose up -d' >> /etc/incron.d/1-upgrade
 echo '/data/volumes/psc/watch/update IN_MODIFY cd /data/composer/psc && docker-compose up -d' >> /etc/incron.d/2-update
 
-curl -L "https://github.com/docker/compose/releases/download/1.28.5/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+curl -L "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
 chmod +x /usr/local/bin/docker-compose
 
 docker network create nginx-proxy
 
-curl -L "https://gitlab.com/printshopcreator/psc-per-vm/-/raw/master/data/composer/letsencrypt/docker-compose.yml" -o /data/composer/letsencrypt/docker-compose.yml
-curl -L "https://gitlab.com/printshopcreator/psc-per-vm/-/raw/master/data/composer/psc/docker-compose.yml" -o /data/composer/psc/docker-compose.yml
+curl -L "https://git.thomas-peterson.de/boonkerz/psc-per-vm/raw/branch/master/data/composer/letsencrypt/docker-compose.yml" -o /data/composer/letsencrypt/docker-compose.yml
+curl -L "https://git.thomas-peterson.de/boonkerz/psc-per-vm/raw/branch/master/data/composer/psc/docker-compose.yml" -o /data/composer/psc/docker-compose.yml
+curl -L "https://git.thomas-peterson.de/boonkerz/psc-per-vm/raw/branch/master/my_proxy.conf" -o /data/volumes/letsencrypt/conf/my_proxy.conf
+
 
 cd /data/composer/letsencrypt
 docker-compose up -d