orbitzs пре 3 година
родитељ
комит
514692fbab
5 измењених фајлова са 98 додато и 7 уклоњено
  1. 1 1
      calibre-web/.env
  2. 3 0
      calibre-web/.gitignore
  3. 18 1
      calibre-web/docker-compose.yml
  4. 18 5
      script/docker_push_all.sh
  5. 58 0
      script/rmtag.sh

+ 1 - 1
calibre-web/.env

@@ -1,3 +1,3 @@
 CALIBRE_WEB_NAME=calibre-web
 CALIBRE_NAME=calibre
-CALIBRE_ROOT=/home/tuffy/docker/calibre-web
+CALIBRE_ROOT=/home/tuffy/docker/clone/Dockers_dev/calibre-web

+ 3 - 0
calibre-web/.gitignore

@@ -0,0 +1,3 @@
+books/
+calibre-web/
+calibre-web2/

+ 18 - 1
calibre-web/docker-compose.yml

@@ -15,6 +15,23 @@ services:
       - 8083:8083
     restart: "no" 
 
+
+  calibre-web2:
+    image: ghcr.io/linuxserver/calibre-web
+    container_name: ${CALIBRE_WEB_NAME}2 
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Asia/Hong_Kong
+      - DOCKER_MODS=linuxserver/calibre-web:calibre
+    volumes:
+      - ${CALIBRE_ROOT}/calibre-web2/config:/config 
+      - ${CALIBRE_ROOT}/books:/books
+    ports:
+      - 8084:8083
+    restart: "no" 
+
+
   calibre:
     image: ghcr.io/linuxserver/calibre
     container_name: ${CALIBRE_NAME} 
@@ -29,6 +46,6 @@ services:
     volumes:
       - ${CALIBRE_ROOT}/books:/config
     ports:
-      - 8080:8080
+      - 8087:8080
       - 8081:8081
     restart: "no" 

+ 18 - 5
script/docker_push_all.sh

@@ -1,15 +1,28 @@
 #!/bin/bash
 server=hubreg.algometic.com
 docker images --format {{.Repository}}:{{.Tag}} |&
-while read -p first second; do
+while read -p first second third; do
    if [[ $1 == "noexec" ]]
    then
-       echo docker tag $second $server/$second
-       echo docker push $server/$second 
+
+       if [[ $second != *".algometic.com"* ]]
+       then
+		echo docker tag $second $server/$second
+	        echo docker push $server/$second 
+       fi
    elif [[ $1 == "push" ]] 
    then
-       docker tag $second $server/$second
-       docker push $server/$second 
+       if [[ $second != *".algometic.com"* ]]
+       then
+       		docker tag $second $server/$second
+	        docker push $server/$second 
+       fi
+   elif [[ $1 == "removetag" ]] 
+   then
+       if [[ $second == *".algometic.com"* ]]
+       then
+	       echo docker rmi $second:$third | rev | cut -c 2- | rev
+       fi
    else
        echo "Usage: docker_push_all.sh {noexec|push}"
        break 

+ 58 - 0
script/rmtag.sh

@@ -0,0 +1,58 @@
+!#/bin/sh
+docker rmi hubreg.algometic.com/hubreg.algometic.com/hubreg.algometic.com/ub1:1.3
+docker rmi hubreg.algometic.com/hubreg.algometic.com/ub1:1.3
+docker rmi hubreg.algometic.com/ub1:1.3
+docker rmi hubreg.algometic.com/bitnami/couchdb:3
+docker rmi hubreg.algometic.com/hubreg.algometic.com/bitnami/couchdb:3
+docker rmi hubreg.algometic.com/hubreg.algometic.com/hubreg.algometic.com/bitnami/couchdb:3
+docker rmi hubreg.algometic.com/hubreg.algometic.com/ubuntu:latest
+docker rmi hubreg.algometic.com/ubuntu:latest
+docker rmi hubreg.algometic.com/hubreg.algometic.com/ghcr.io/linuxserver/syncthing:latest
+docker rmi hubreg.algometic.com/ghcr.io/linuxserver/syncthing:latest
+docker rmi hubreg.algometic.com/citraemu/citra-multiplayer-dedicated:latest
+docker rmi hubreg.algometic.com/hubreg.algometic.com/citraemu/citra-multiplayer-dedicated:latest
+docker rmi hubreg.algometic.com/lscr.io/linuxserver/wireguard:latest
+docker rmi hubreg.algometic.com/hubreg.algometic.com/lscr.io/linuxserver/wireguard:latest
+docker rmi hubreg.algometic.com/hubreg.algometic.com/hub.algometic.com/ub1:latest
+docker rmi hubreg.algometic.com/hubreg.algometic.com/hubreg.algometic.com/ub1:1.2
+docker rmi hubreg.algometic.com/hubreg.algometic.com/ub1:1.2
+docker rmi hubreg.algometic.com/ub1:1.2
+docker rmi hub.algometic.com/ub1:latest
+docker rmi hubreg.algometic.com/hub.algometic.com/ub1:latest
+docker rmi hubreg.algometic.com/hubreg.algometic.com/ngoduykhanh/wireguard-ui:latest
+docker rmi hubreg.algometic.com/ngoduykhanh/wireguard-ui:latest
+docker rmi hubreg.algometic.com/flant/ovpn-admin:1.7.5
+docker rmi hubreg.algometic.com/hubreg.algometic.com/flant/ovpn-admin:1.7.5
+docker rmi hubreg.algometic.com/hubreg.algometic.com/hubreg.algometic.com/mailserver/docker-mailserver:latest
+docker rmi hubreg.algometic.com/hubreg.algometic.com/mailserver/docker-mailserver:latest
+docker rmi hubreg.algometic.com/mailserver/docker-mailserver:latest
+docker rmi hubreg.algometic.com/hubreg.algometic.com/registry:2
+docker rmi hubreg.algometic.com/hubreg.algometic.com/registry:2.7
+docker rmi hubreg.algometic.com/registry:2
+docker rmi hubreg.algometic.com/registry:2.7
+docker rmi hubreg.algometic.com/embarkstudios/wireguard-ui:latest
+docker rmi hubreg.algometic.com/hubreg.algometic.com/embarkstudios/wireguard-ui:latest
+docker rmi hubreg.algometic.com/hubreg.algometic.com/joxit/docker-registry-ui:latest
+docker rmi hubreg.algometic.com/joxit/docker-registry-ui:latest
+docker rmi hubreg.algometic.com/hubreg.algometic.com/ubuntu:20.04
+docker rmi hubreg.algometic.com/ubuntu:20.04
+docker rmi hubreg.algometic.com/qmcgaw/stackedit:latest
+docker rmi hubreg.algometic.com/hubreg.algometic.com/qmcgaw/stackedit:latest
+docker rmi hubreg.algometic.com/3ds.algometic.com/my-alpine:latest
+docker rmi hubreg.algometic.com/hubreg.algometic.com/3ds.algometic.com/my-alpine:latest
+docker rmi hubreg.algometic.com/hubreg.algometic.com/ghcr.io/linuxserver/openvpn-as:latest
+docker rmi hubreg.algometic.com/hubreg.algometic.com/ghcr.io/linuxserver/openvpn-as:version-2.9.0-5c5bd120-Ubuntu18
+docker rmi hubreg.algometic.com/ghcr.io/linuxserver/openvpn-as:latest
+docker rmi hubreg.algometic.com/ghcr.io/linuxserver/openvpn-as:version-2.9.0-5c5bd120-Ubuntu18
+docker rmi hubreg.algometic.com/perara/wg-manager:latest
+docker rmi hubreg.algometic.com/hubreg.algometic.com/perara/wg-manager:latest
+docker rmi hubreg.algometic.com/hubreg.algometic.com/kylemanna/openvpn:latest
+docker rmi hubreg.algometic.com/kylemanna/openvpn:latest
+docker rmi hubreg.algometic.com/hubreg.algometic.com/hubreg.algometic.com/kylemanna/openvpn:2.4
+docker rmi hubreg.algometic.com/hubreg.algometic.com/kylemanna/openvpn:2.4
+docker rmi hubreg.algometic.com/kylemanna/openvpn:2.4
+docker rmi hub.algometic.com/konradkleine/docker-registry-frontend:v2
+docker rmi hubreg.algometic.com/hub.algometic.com/konradkleine/docker-registry-frontend:v2
+docker rmi hubreg.algometic.com/hubreg.algometic.com/hubreg.algometic.com/hub.algometic.com/konradkleine/docker-registry-frontend:v2
+docker rmi hubreg.algometic.com/hubreg.algometic.com/konradkleine/docker-registry-frontend:v2
+