diff --git a/gitea/prod.stack.yml b/gitea/prod.stack.yml index 8e347e3..f6c5d99 100644 --- a/gitea/prod.stack.yml +++ b/gitea/prod.stack.yml @@ -3,7 +3,6 @@ # chown 1000:1000 config/ data/ # pull:: docker compose --env-file ./gitea/env.cfg -f ./gitea/prod.stack.yml pull # Run:: docker compose -p gitea --env-file ./gitea/env.cfg -f ./gitea/prod.stack.yml up -d -version: "3.9" services: diff --git a/harbor/compose.yaml b/harbor/compose.yaml new file mode 100644 index 0000000..60ac8d5 --- /dev/null +++ b/harbor/compose.yaml @@ -0,0 +1,265 @@ +version: '2.3' +services: + log: + image: goharbor/harbor-log:v2.2.2 + container_name: harbor-log + restart: always + dns_search: . + cap_drop: + - ALL + cap_add: + - CHOWN + - DAC_OVERRIDE + - SETGID + - SETUID + volumes: + - /var/log/harbor/:/var/log/docker/:z + - type: bind + source: ./common/config/log/logrotate.conf + target: /etc/logrotate.d/logrotate.conf + - type: bind + source: ./common/config/log/rsyslog_docker.conf + target: /etc/rsyslog.d/rsyslog_docker.conf + ports: + - 127.0.0.1:1514:10514 + networks: + - harbor + registry: + image: goharbor/registry-photon:v2.2.2 + container_name: registry + restart: always + cap_drop: + - ALL + cap_add: + - CHOWN + - SETGID + - SETUID + volumes: + - /data/registry:/storage:z + - ./common/config/registry/:/etc/registry/:z + - type: bind + source: /data/secret/registry/root.crt + target: /etc/registry/root.crt + - type: bind + source: ./common/config/shared/trust-certificates + target: /harbor_cust_cert + networks: + - harbor + dns_search: . + depends_on: + - log + logging: + driver: "syslog" + options: + syslog-address: "tcp://127.0.0.1:1514" + tag: "registry" + registryctl: + image: goharbor/harbor-registryctl:v2.2.2 + container_name: registryctl + env_file: + - ./common/config/registryctl/env + restart: always + cap_drop: + - ALL + cap_add: + - CHOWN + - SETGID + - SETUID + volumes: + - /data/registry:/storage:z + - ./common/config/registry/:/etc/registry/:z + - type: bind + source: ./common/config/registryctl/config.yml + target: /etc/registryctl/config.yml + - type: bind + source: ./common/config/shared/trust-certificates + target: /harbor_cust_cert + networks: + - harbor + dns_search: . + depends_on: + - log + logging: + driver: "syslog" + options: + syslog-address: "tcp://127.0.0.1:1514" + tag: "registryctl" + postgresql: + image: goharbor/harbor-db:v2.2.2 + container_name: harbor-db + restart: always + cap_drop: + - ALL + cap_add: + - CHOWN + - DAC_OVERRIDE + - SETGID + - SETUID + volumes: + - /data/database:/var/lib/postgresql/data:z + networks: + harbor: + dns_search: . + env_file: + - ./common/config/db/env + depends_on: + - log + logging: + driver: "syslog" + options: + syslog-address: "tcp://127.0.0.1:1514" + tag: "postgresql" + core: + image: goharbor/harbor-core:v2.2.2 + container_name: harbor-core + env_file: + - ./common/config/core/env + restart: always + cap_drop: + - ALL + cap_add: + - SETGID + - SETUID + volumes: + - /data/ca_download/:/etc/core/ca/:z + - /data/:/data/:z + - ./common/config/core/certificates/:/etc/core/certificates/:z + - type: bind + source: ./common/config/core/app.conf + target: /etc/core/app.conf + - type: bind + source: /data/secret/core/private_key.pem + target: /etc/core/private_key.pem + - type: bind + source: /data/secret/keys/secretkey + target: /etc/core/key + - type: bind + source: ./common/config/shared/trust-certificates + target: /harbor_cust_cert + networks: + harbor: + dns_search: . + depends_on: + - log + - registry + - redis + - postgresql + logging: + driver: "syslog" + options: + syslog-address: "tcp://127.0.0.1:1514" + tag: "core" + portal: + image: goharbor/harbor-portal:v2.2.2 + container_name: harbor-portal + restart: always + cap_drop: + - ALL + cap_add: + - CHOWN + - SETGID + - SETUID + - NET_BIND_SERVICE + volumes: + - type: bind + source: ./common/config/portal/nginx.conf + target: /etc/nginx/nginx.conf + networks: + - harbor + dns_search: . + depends_on: + - log + logging: + driver: "syslog" + options: + syslog-address: "tcp://127.0.0.1:1514" + tag: "portal" + + jobservice: + image: goharbor/harbor-jobservice:v2.2.2 + container_name: harbor-jobservice + env_file: + - ./common/config/jobservice/env + restart: always + cap_drop: + - ALL + cap_add: + - CHOWN + - SETGID + - SETUID + volumes: + - /data/job_logs:/var/log/jobs:z + - type: bind + source: ./common/config/jobservice/config.yml + target: /etc/jobservice/config.yml + - type: bind + source: ./common/config/shared/trust-certificates + target: /harbor_cust_cert + networks: + - harbor + dns_search: . + depends_on: + - core + logging: + driver: "syslog" + options: + syslog-address: "tcp://127.0.0.1:1514" + tag: "jobservice" + redis: + image: goharbor/redis-photon:v2.2.2 + container_name: redis + restart: always + cap_drop: + - ALL + cap_add: + - CHOWN + - SETGID + - SETUID + volumes: + - /data/redis:/var/lib/redis + networks: + harbor: + dns_search: . + depends_on: + - log + logging: + driver: "syslog" + options: + syslog-address: "tcp://127.0.0.1:1514" + tag: "redis" + proxy: + image: goharbor/nginx-photon:v2.2.2 + container_name: nginx + restart: always + cap_drop: + - ALL + cap_add: + - CHOWN + - SETGID + - SETUID + - NET_BIND_SERVICE + volumes: + - ./common/config/nginx:/etc/nginx:z + - /data/secret/cert:/etc/cert:z + - type: bind + source: ./common/config/shared/trust-certificates + target: /harbor_cust_cert + networks: + - harbor + dns_search: . + ports: + - 8080:8080 + - 8443:8443 + depends_on: + - registry + - core + - portal + - log + logging: + driver: "syslog" + options: + syslog-address: "tcp://127.0.0.1:1514" + tag: "proxy" +networks: + harbor: + external: false \ No newline at end of file diff --git a/portainer-ce/portainer-ce.yaml b/portainer-ce/portainer-ce.yaml index a46f140..cfb5586 100644 --- a/portainer-ce/portainer-ce.yaml +++ b/portainer-ce/portainer-ce.yaml @@ -1,5 +1,4 @@ -# docker compose -p portainer-ce --env-file ./portainer-ce/env.yml -f ./portainer-ce/portainer-ce.yaml up -d -version: '3.8' +# Run:: docker compose -p portainer-ce --env-file ./portainer-ce/env.yml -f ./portainer-ce/portainer-ce.yaml up -d services: portainer: diff --git a/webout/configs/caddy/web-http.conf b/webout/configs/caddy/web-http.conf new file mode 100644 index 0000000..9a621cd --- /dev/null +++ b/webout/configs/caddy/web-http.conf @@ -0,0 +1,10 @@ + +https://www.6t7.net, +https://git.6t7.net { + redir https://6t7.net permanent +} + +https://6t7.net { + tls moqiruyi@gmail.com + reverse_proxy 10.0.96.2:3000 +} \ No newline at end of file diff --git a/webout/env.cfg b/webout/env.cfg index 6ff57fa..e4c74a4 100644 --- a/webout/env.cfg +++ b/webout/env.cfg @@ -1 +1,2 @@ -IMAGE_TAG=hub.tp229.com:3500/caddy:2.8.4 +#IMAGE_TAG=hub.tp229.com:3500/caddy:2.8.4 +IMAGE_TAG=caddy:2.8.4 \ No newline at end of file