diff --git a/docker/.env b/docker/.env index 09941f25..2938cf04 100644 --- a/docker/.env +++ b/docker/.env @@ -1,4 +1,4 @@ -APPHUB_VERSION=0.1 +APPHUB_VERSION=0.0.1 DEPLOYMENT_VERSION=2.19.0 GIT_VERSION=1.20.4 -PROXY_VERSION=2.10.3 \ No newline at end of file +PROXY_VERSION=2.10.4 \ No newline at end of file diff --git a/docker/w9apphub/Dockerfile b/docker/apphub/Dockerfile similarity index 100% rename from docker/w9apphub/Dockerfile rename to docker/apphub/Dockerfile diff --git a/docker/w9apphub/README.md b/docker/apphub/README.md similarity index 100% rename from docker/w9apphub/README.md rename to docker/apphub/README.md diff --git a/docker/w9apphub/config/entrypoint.sh b/docker/apphub/config/entrypoint.sh similarity index 100% rename from docker/w9apphub/config/entrypoint.sh rename to docker/apphub/config/entrypoint.sh diff --git a/docker/w9apphub/config/supervisord.conf b/docker/apphub/config/supervisord.conf similarity index 100% rename from docker/w9apphub/config/supervisord.conf rename to docker/apphub/config/supervisord.conf diff --git a/docker/w9apphub/credential.json b/docker/apphub/credential.json similarity index 100% rename from docker/w9apphub/credential.json rename to docker/apphub/credential.json diff --git a/docker/w9deployment/Dockerfile b/docker/deployment/Dockerfile similarity index 100% rename from docker/w9deployment/Dockerfile rename to docker/deployment/Dockerfile diff --git a/docker/w9deployment/README.md b/docker/deployment/README.md similarity index 100% rename from docker/w9deployment/README.md rename to docker/deployment/README.md diff --git a/docker/w9deployment/init_portainer.go b/docker/deployment/init_portainer.go similarity index 100% rename from docker/w9deployment/init_portainer.go rename to docker/deployment/init_portainer.go diff --git a/docker/w9git/Dockerfile b/docker/git/Dockerfile similarity index 100% rename from docker/w9git/Dockerfile rename to docker/git/Dockerfile diff --git a/docker/w9git/README.md b/docker/git/README.md similarity index 100% rename from docker/w9git/README.md rename to docker/git/README.md diff --git a/docker/w9git/src/config/app.ini.example b/docker/git/src/config/app.ini.example similarity index 100% rename from docker/w9git/src/config/app.ini.example rename to docker/git/src/config/app.ini.example diff --git a/docker/w9git/src/s6/README.md b/docker/git/src/s6/README.md similarity index 100% rename from docker/w9git/src/s6/README.md rename to docker/git/src/s6/README.md diff --git a/docker/w9git/src/s6/user/run b/docker/git/src/s6/user/run similarity index 100% rename from docker/w9git/src/s6/user/run rename to docker/git/src/s6/user/run diff --git a/docker/w9git/src/s6/user/setup b/docker/git/src/s6/user/setup similarity index 100% rename from docker/w9git/src/s6/user/setup rename to docker/git/src/s6/user/setup diff --git a/docker/w9proxy/Dockerfile b/docker/proxy/Dockerfile similarity index 100% rename from docker/w9proxy/Dockerfile rename to docker/proxy/Dockerfile diff --git a/docker/w9proxy/README.md b/docker/proxy/README.md similarity index 100% rename from docker/w9proxy/README.md rename to docker/proxy/README.md diff --git a/docker/w9proxy/initproxy.conf b/docker/proxy/initproxy.conf similarity index 100% rename from docker/w9proxy/initproxy.conf rename to docker/proxy/initproxy.conf diff --git a/docker/w9proxy/user.sh b/docker/proxy/user.sh similarity index 100% rename from docker/w9proxy/user.sh rename to docker/proxy/user.sh diff --git a/docker/w9apphub/.env b/docker/w9apphub/.env deleted file mode 100644 index ea4a7790..00000000 --- a/docker/w9apphub/.env +++ /dev/null @@ -1,3 +0,0 @@ -APP_NAME=websoft9-apphub -APP_VERSION=0.0.1 -APP_NETWORK=websoft9 diff --git a/docker/w9apphub/docker-compose.yml b/docker/w9apphub/docker-compose.yml deleted file mode 100644 index 612050d8..00000000 --- a/docker/w9apphub/docker-compose.yml +++ /dev/null @@ -1,23 +0,0 @@ -version: "3.8" - -services: - apphub: - image: websoft9dev/apphub:$APP_VERSION - container_name: $APP_NAME - ports: - - 9001-9999:8080 - restart: always - volumes: - - logs:/websoft9/apphub/logs - - media:/websoft9/media - - config:/websoft9/apphub/src/conf - -networks: - default: - name: $APP_NETWORK - external: true - -volumes: - logs: - media: - config: diff --git a/docker/w9deployment/docker-compose.yml b/docker/w9deployment/docker-compose.yml deleted file mode 100644 index ef678a41..00000000 --- a/docker/w9deployment/docker-compose.yml +++ /dev/null @@ -1,24 +0,0 @@ -# Portainer can not use .env for the reason that then environments at .env may cover other stacks's .env - -version: "3.8" -services: - - portainer: - container_name: websoft9-deployment - image: websoft9dev/deployment:2.19.0 - restart: always - ports: - - 9001-9999:9000 - volumes: - - deployment:/data - - /var/run/docker.sock:/var/run/docker.sock - labels: - com.docker.compose.w9_http.port: 9000 - -networks: - default: - name: websoft9 - external: true - -volumes: - deployment: \ No newline at end of file diff --git a/docker/w9git/.env b/docker/w9git/.env deleted file mode 100644 index a921f346..00000000 --- a/docker/w9git/.env +++ /dev/null @@ -1,11 +0,0 @@ -APP_NAME=websoft9-git -APP_VERSION=1.20.4 -APP_NETWORK=websoft9 - -INSTALL_LOCK=true -DISABLE_SSH=true -RUN_MODE=prod -# container inner port -HTTP_PORT=3000 -DISABLE_REGISTRATION=false -REQUIRE_SIGNIN_VIEW=false diff --git a/docker/w9git/docker-compose.yml b/docker/w9git/docker-compose.yml deleted file mode 100644 index 39d7393a..00000000 --- a/docker/w9git/docker-compose.yml +++ /dev/null @@ -1,29 +0,0 @@ -# image: https://hub.docker.com/r/gitea/gitea -# docs: https://docs.gitea.io/zh-cn/install-with-docker -# gitea admin user create --admin --username websoft9 --random-password --email help@websoft9.com - -version: '3.8' - -services: - git: - container_name: $APP_NAME - image: websoft9dev/git:$APP_VERSION - restart: always - env_file: - - .env - volumes: - - git:/data - - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro - ports: - - 9001-9999:3000 - labels: - com.docker.compose.w9_http.port: 3000 - -networks: - default: - name: ${APP_NETWORK} - external: true - -volumes: - git: \ No newline at end of file diff --git a/docker/w9proxy/.env b/docker/w9proxy/.env deleted file mode 100644 index da2d9b09..00000000 --- a/docker/w9proxy/.env +++ /dev/null @@ -1,3 +0,0 @@ -APP_NAME=websoft9-proxy -APP_VERSION=2.10.4 -APP_NETWORK=websoft9 diff --git a/docker/w9proxy/docker-compose.yml b/docker/w9proxy/docker-compose.yml deleted file mode 100644 index 5319b875..00000000 --- a/docker/w9proxy/docker-compose.yml +++ /dev/null @@ -1,33 +0,0 @@ -# image: https://hub.docker.com/r/jc21/nginx-proxy-manager -# docs: https://nginxproxymanager.com/guide/#quick-setup - -version: "3.8" - -services: - app: - image: websoft9dev/proxy:2.10.4 - restart: always - container_name: ${APP_NAME} - build: - context: . - dockerfile: Dockerfile - ports: - - "80:80" - - "443:443" - - "9001-9999:81" - volumes: - - nginx_data:/data - - nginx_letsencrypt:/etc/letsencrypt - labels: - com.docker.compose.w9_http.port: 80 - com.docker.compose.w9_https.port: 443 - com.docker.compose.w9_console.port: 81 - -networks: - default: - name: ${APP_NETWORK} - external: true - -volumes: - nginx_data: - nginx_letsencrypt: \ No newline at end of file