From 304fe311b8babb15b2fc0cdec14acbe2dbaa3817 Mon Sep 17 00:00:00 2001 From: Xuyang Zhang Date: Wed, 6 Sep 2023 13:17:37 +0800 Subject: [PATCH 1/5] fix docs (#1) Co-authored-by: xuyang --- README.md | 9 +++++---- README_cn.md | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 5e97a9d..abddfb0 100644 --- a/README.md +++ b/README.md @@ -96,16 +96,17 @@ You can replace it yourself at startup - Linux ```shell - sudo docker run -d --name aospace-all-in-one \ +DATADIR="$HOME/aospace" +sudo docker run -d --name aospace-all-in-one \ --restart always \ --network=ao-space \ --publish 5678:5678 \ --publish 127.0.0.1:5680:5680 \ - -v $AOSPACE_HOME_DIR:/aospace \ + -v $DATADIR:/aospace \ -v /var/run/docker.sock:/var/run/docker.sock:ro \ - -e AOSPACE_DATADIR=$AOSPACE_HOME_DIR \ + -e AOSPACE_DATADIR=$DATADIR \ -e RUN_NETWORK_MODE="host" \ - hub.eulix.xyz/ao-space/space-agent:dev + ghcr.io/ao-space/space-agent:latest ``` if you want to run ao.space on other os, refer to [ao.space self-hosting doc](https://ao.space/docs/install-opensource-linux) diff --git a/README_cn.md b/README_cn.md index 6fa3663..f93b4e1 100644 --- a/README_cn.md +++ b/README_cn.md @@ -95,16 +95,17 @@ docker version - Linux 环境 ```shell - sudo docker run -d --name aospace-all-in-one \ +DATADIR="$HOME/aospace" +sudo docker run -d --name aospace-all-in-one \ --restart always \ --network=ao-space \ --publish 5678:5678 \ --publish 127.0.0.1:5680:5680 \ - -v $AOSPACE_HOME_DIR:/aospace \ + -v $DATADIR:/aospace \ -v /var/run/docker.sock:/var/run/docker.sock:ro \ - -e AOSPACE_DATADIR=$AOSPACE_HOME_DIR \ + -e AOSPACE_DATADIR=$DATADIR \ -e RUN_NETWORK_MODE="host" \ - hub.eulix.xyz/ao-space/space-agent:dev + ghcr.io/ao-space/space-agent:latest ``` 其他环境的启动，可以参考[傲空间私有部署](https://ao.space/open/documentation/105001) From a9f4ac2aee58570fed7208e175f7414def96d849 Mon Sep 17 00:00:00 2001 From: YIN JIA YI Date: Mon, 11 Sep 2023 08:35:36 +0800 Subject: [PATCH 2/5] feat(ci): add global container registry (#2) --- .github/workflows/container.yml | 92 +++++++++++++++++++++++++++++++-- 1 file changed, 87 insertions(+), 5 deletions(-) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index fa80f57..6cea02b 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Institute of Software, Chinese Academy of Sciences (ISCAS) +# Copyright (c) 2022 Institute of Software Chinese Academy of Sciences (ISCAS) # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,13 +23,20 @@ on: env: REGISTRY: ghcr.io - EULIX_REGISTRY: ${{ secrets.EULIX_REGISTRY }} + EULIX_REGISTRY: hub.eulix.xyz + HUAWEICLOUD_REGISTRY_SH: swr.cn-east-3.myhuaweicloud.com + HUAWEICLOUD_REGISTRY_BJ: swr.cn-north-4.myhuaweicloud.com + HUAWEICLOUD_REGISTRY_GZ: swr.cn-south-1.myhuaweicloud.com + HUAWEICLOUD_REGISTRY_HK: swr.ap-southeast-1.myhuaweicloud.com + HUAWEICLOUD_REGISTRY_SG: swr.ap-southeast-3.myhuaweicloud.com + HUAWEICLOUD_REGISTRY_AF: swr.af-south-1.myhuaweicloud.com + HUAWEICLOUD_REGISTRY_LA: swr.la-north-2.myhuaweicloud.com IMAGE_NAME: ${{ github.repository }} jobs: build: - runs-on: [self-hosted, linux, x64] + runs-on: ubuntu-latest permissions: contents: read packages: write @@ -46,6 +53,9 @@ jobs: - name: Setup Docker buildx uses: docker/setup-buildx-action@v2 + - run: echo "GITHUB_REPOSITORY_NAME=${GITHUB_REPOSITORY#*/}" >> $GITHUB_ENV + shell: bash + - name: Inspect builder run: | echo "Name: ${{ steps.buildx.outputs.name }}" @@ -70,6 +80,69 @@ jobs: username: ${{ secrets.EULIX_REGISTRY_USERNAME }} password: ${{ secrets.EULIX_REGISTRY_PASSWORD }} + - name: Log into registry Docker Hub + if: github.event_name != 'pull_request' + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKER_HUB_REGISTRY_USERNAME }} + password: ${{ secrets.DOCKER_HUB_REGISTRY_PASSWORD }} + + - name: Log into registry ${{ env.HUAWEICLOUD_REGISTRY_SH }} + if: github.event_name != 'pull_request' + uses: docker/login-action@v2 + with: + registry: ${{ env.HUAWEICLOUD_REGISTRY_SH }} + username: cn-east-3@${{ secrets.HUAWEICLOUD_USERNAME }} + password: ${{ secrets.HUAWEICLOUD_PASSWORD }} + + - name: Log into registry ${{ env.HUAWEICLOUD_REGISTRY_BJ }} + if: github.event_name != 'pull_request' + uses: docker/login-action@v2 + with: + registry: ${{ env.HUAWEICLOUD_REGISTRY_BJ }} + username: cn-north-4@${{ secrets.HUAWEICLOUD_USERNAME }} + password: ${{ secrets.HUAWEICLOUD_PASSWORD }} + + - name: Log into registry ${{ env.HUAWEICLOUD_REGISTRY_GZ }} + if: github.event_name != 'pull_request' + uses: docker/login-action@v2 + with: + registry: ${{ env.HUAWEICLOUD_REGISTRY_GZ }} + username: cn-south-1@${{ secrets.HUAWEICLOUD_USERNAME }} + password: ${{ secrets.HUAWEICLOUD_PASSWORD }} + + - name: Log into registry ${{ env.HUAWEICLOUD_REGISTRY_SG }} + if: github.event_name != 'pull_request' + uses: docker/login-action@v2 + with: + registry: ${{ env.HUAWEICLOUD_REGISTRY_SG }} + username: ap-southeast-3@${{ secrets.HUAWEICLOUD_USERNAME }} + password: ${{ secrets.HUAWEICLOUD_PASSWORD }} + + - name: Log into registry ${{ env.HUAWEICLOUD_REGISTRY_HK }} + if: github.event_name != 'pull_request' + uses: docker/login-action@v2 + with: + registry: ${{ env.HUAWEICLOUD_REGISTRY_HK }} + username: ap-southeast-1@${{ secrets.HUAWEICLOUD_USERNAME }} + password: ${{ secrets.HUAWEICLOUD_PASSWORD }} + + - name: Log into registry ${{ env.HUAWEICLOUD_REGISTRY_AF }} + if: github.event_name != 'pull_request' + uses: docker/login-action@v2 + with: + registry: ${{ env.HUAWEICLOUD_REGISTRY_AF }} + username: af-south-1@${{ secrets.HUAWEICLOUD_USERNAME }} + password: ${{ secrets.HUAWEICLOUD_PASSWORD }} + + - name: Log into registry ${{ env.HUAWEICLOUD_REGISTRY_LA }} + if: github.event_name != 'pull_request' + uses: docker/login-action@v2 + with: + registry: ${{ env.HUAWEICLOUD_REGISTRY_LA }} + username: la-north-2@${{ secrets.HUAWEICLOUD_USERNAME }} + password: ${{ secrets.HUAWEICLOUD_PASSWORD }} + - name: Extract Docker metadata id: meta uses: docker/metadata-action@v2 @@ -77,10 +150,18 @@ jobs: images: | ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} ${{ env.EULIX_REGISTRY }}/${{ env.IMAGE_NAME }} + aospace/${{ env.GITHUB_REPOSITORY_NAME }} + ${{ env.HUAWEICLOUD_REGISTRY_SH }}/${{ env.IMAGE_NAME }} + ${{ env.HUAWEICLOUD_REGISTRY_BJ }}/${{ env.IMAGE_NAME }} + ${{ env.HUAWEICLOUD_REGISTRY_GZ }}/${{ env.IMAGE_NAME }} + ${{ env.HUAWEICLOUD_REGISTRY_HK }}/${{ env.IMAGE_NAME }} + ${{ env.HUAWEICLOUD_REGISTRY_SG }}/${{ env.IMAGE_NAME }} + ${{ env.HUAWEICLOUD_REGISTRY_AF }}/${{ env.IMAGE_NAME }} + ${{ env.HUAWEICLOUD_REGISTRY_LA }}/${{ env.IMAGE_NAME }} - name: Build and push Docker image id: build-and-push - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v4.2.1 with: context: . push: ${{ github.event_name != 'pull_request' }} @@ -90,4 +171,5 @@ jobs: platforms: linux/amd64,linux/arm64 cache-from: type=gha cache-to: type=gha,mode=max - file: Dockerfile \ No newline at end of file + file: Dockerfile + provenance: false \ No newline at end of file From 2f8211f2fbba5972bbc29e431ee57c945dcc1eb5 Mon Sep 17 00:00:00 2001 From: YIN JIA YI Date: Tue, 12 Sep 2023 01:16:34 +0800 Subject: [PATCH 3/5] feat(registry): use global container registry (#3) * feat(registry): use global container registry --- res/aospace-upgrade.yml | 2 +- res/docker-compose_run_as_docker.yml | 14 +++++++------- ...ker-compose_run_as_docker_network_mode_host.yml | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/res/aospace-upgrade.yml b/res/aospace-upgrade.yml index 5361ff4..975c095 100644 --- a/res/aospace-upgrade.yml +++ b/res/aospace-upgrade.yml @@ -16,7 +16,7 @@ version: '2.4' services: aospace-upgrade: container_name: aospace-upgrade - image: hub.eulix.xyz/ao-space/space-upgrade:v1.0.0 + image: registry.ao.space/ao-space/space-upgrade:dev ports: - "127.0.0.1:5681:5681" environment: diff --git a/res/docker-compose_run_as_docker.yml b/res/docker-compose_run_as_docker.yml index f25cbb1..cc51c0e 100644 --- a/res/docker-compose_run_as_docker.yml +++ b/res/docker-compose_run_as_docker.yml @@ -17,7 +17,7 @@ version: '2.4' services: aospace-postgresql: container_name: aospace-postgresql - image: hub.eulix.xyz/cicada-private/aospace-postgresql:v1.0.0 + image: registry.ao.space/ao-space/space-postgresql:dev restart: always healthcheck: test: pg_isready @@ -54,7 +54,7 @@ services: aospace-filepreview: container_name: aospace-filepreview - image: hub.eulix.xyz/ao-space/space-filepreview:v1.0.0 + image: registry.ao.space/ao-space/space-filepreview:dev restart: always depends_on: aospace-redis: @@ -73,7 +73,7 @@ services: aospace-fileapi: container_name: aospace-fileapi - image: hub.eulix.xyz/ao-space/space-aofs:v1.0.0 + image: registry.ao.space/ao-space/space-aofs:dev restart: always depends_on: aospace-postgresql: @@ -112,7 +112,7 @@ services: aospace-gateway: container_name: aospace-gateway - image: hub.eulix.xyz/ao-space/space-gateway:v1.0.0 + image: registry.ao.space/ao-space/space-gateway:dev restart: always ports: - "127.0.0.1:8080:8080" @@ -154,14 +154,14 @@ services: aonetwork-client: container_name: aonetwork-client - image: hub.eulix.xyz/ao-space/gt:client-v2.0.4 + image: registry.ao.space/ao-space/gt:client-dev restart: always volumes: - /etc/ao-space/gt:/opt/config aospace-nginx: container_name: aospace-nginx - image: hub.eulix.xyz/ao-space/space-web:v1.0.0 + image: registry.ao.space/ao-space/space-web:dev restart: always ports: - "9980:80" @@ -190,7 +190,7 @@ services: aospace-media-vod: container_name: aospace-media-vod - image: hub.eulix.xyz/ao-space/space-media-vod:v1.0.0 + image: registry.ao.space/ao-space/space-media-vod:dev restart: always ports: - "127.0.0.1:3001:3001" diff --git a/res/docker-compose_run_as_docker_network_mode_host.yml b/res/docker-compose_run_as_docker_network_mode_host.yml index c8e086a..d9c62da 100644 --- a/res/docker-compose_run_as_docker_network_mode_host.yml +++ b/res/docker-compose_run_as_docker_network_mode_host.yml @@ -17,7 +17,7 @@ version: '2.4' services: aospace-postgresql: container_name: aospace-postgresql - image: hub.eulix.xyz/cicada-private/aospace-postgresql:v1.0.0 + image: registry.ao.space/ao-space/space-postgresql:dev restart: always healthcheck: test: pg_isready @@ -54,7 +54,7 @@ services: aospace-filepreview: container_name: aospace-filepreview - image: hub.eulix.xyz/ao-space/space-filepreview:v1.0.0 + image: registry.ao.space/ao-space/space-filepreview:dev restart: always depends_on: aospace-redis: @@ -73,7 +73,7 @@ services: aospace-fileapi: container_name: aospace-fileapi - image: hub.eulix.xyz/ao-space/space-aofs:v1.0.0 + image: registry.ao.space/ao-space/space-aofs:dev restart: always depends_on: aospace-postgresql: @@ -109,7 +109,7 @@ services: aospace-gateway: container_name: aospace-gateway - image: hub.eulix.xyz/ao-space/space-gateway:v1.0.0 + image: registry.ao.space/ao-space/space-gateway:dev restart: always ports: - "127.0.0.1:8080:8080" @@ -151,7 +151,7 @@ services: aonetwork-client: container_name: aonetwork-client - image: hub.eulix.xyz/ao-space/gt:client-v2.0.4 + image: registry.ao.space/ao-space/gt:client-dev restart: always network_mode: "host" volumes: @@ -159,7 +159,7 @@ services: aospace-nginx: container_name: aospace-nginx - image: hub.eulix.xyz/ao-space/space-web:v1.0.0 + image: registry.ao.space/ao-space/space-web:dev restart: always network_mode: "host" # 以容器运行时，去掉了 host 网络。如果 nginx 和 network-client 指定 host 网络，那么这2个容器会处于 docker-desktop 的子网中，比如 192.168.65.x 的网络。和宿主机、还有 网关(ao-space) 网络隔离的。不容易相互访问。 @@ -184,7 +184,7 @@ services: aospace-media-vod: container_name: aospace-media-vod - image: hub.eulix.xyz/ao-space/space-media-vod:v1.0.0 + image: registry.ao.space/ao-space/space-media-vod:dev restart: always ports: - "127.0.0.1:3001:3001" From cec02f0e06a8f24cc20dae8688db2257541520e8 Mon Sep 17 00:00:00 2001 From: zhdishjava <116045545+zhdishjava@users.noreply.github.com> Date: Tue, 19 Sep 2023 17:24:00 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E5=92=8C=E5=9C=B0=E5=9D=80=20(#7)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: zhaodisheng --- web/boxdocker/src/pages/code.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/boxdocker/src/pages/code.vue b/web/boxdocker/src/pages/code.vue index bffa680..c071ea5 100644 --- a/web/boxdocker/src/pages/code.vue +++ b/web/boxdocker/src/pages/code.vue @@ -21,10 +21,10 @@
傲空间设备码
- 请使用 傲空间 App (V1.9.3及更高版本) 扫码绑定后使用 + 请使用 傲空间开源版 App 扫码绑定后使用
- 未安装傲空间 App 请先 下载傲空间 + 未安装傲空间 App 请先 下载傲空间
From 17d88f38f5aa8965cc03cf5456290f0b6a3a5d8e Mon Sep 17 00:00:00 2001 From: YIN JIA YI Date: Thu, 21 Sep 2023 14:32:24 +0800 Subject: [PATCH 5/5] Release v1.0.1 (#8) --- res/aospace-upgrade.yml | 2 +- res/docker-compose_run_as_docker.yml | 14 +++++++------- ...ker-compose_run_as_docker_network_mode_host.yml | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/res/aospace-upgrade.yml b/res/aospace-upgrade.yml index 975c095..5b471b9 100644 --- a/res/aospace-upgrade.yml +++ b/res/aospace-upgrade.yml @@ -16,7 +16,7 @@ version: '2.4' services: aospace-upgrade: container_name: aospace-upgrade - image: registry.ao.space/ao-space/space-upgrade:dev + image: registry.ao.space/ao-space/space-upgrade:v1.0.1 ports: - "127.0.0.1:5681:5681" environment: diff --git a/res/docker-compose_run_as_docker.yml b/res/docker-compose_run_as_docker.yml index cc51c0e..bb6db44 100644 --- a/res/docker-compose_run_as_docker.yml +++ b/res/docker-compose_run_as_docker.yml @@ -17,7 +17,7 @@ version: '2.4' services: aospace-postgresql: container_name: aospace-postgresql - image: registry.ao.space/ao-space/space-postgresql:dev + image: registry.ao.space/ao-space/space-postgresql:v1.0.1 restart: always healthcheck: test: pg_isready @@ -54,7 +54,7 @@ services: aospace-filepreview: container_name: aospace-filepreview - image: registry.ao.space/ao-space/space-filepreview:dev + image: registry.ao.space/ao-space/space-filepreview:v1.0.1 restart: always depends_on: aospace-redis: @@ -73,7 +73,7 @@ services: aospace-fileapi: container_name: aospace-fileapi - image: registry.ao.space/ao-space/space-aofs:dev + image: registry.ao.space/ao-space/space-aofs:v1.0.1 restart: always depends_on: aospace-postgresql: @@ -112,7 +112,7 @@ services: aospace-gateway: container_name: aospace-gateway - image: registry.ao.space/ao-space/space-gateway:dev + image: registry.ao.space/ao-space/space-gateway:v1.0.1 restart: always ports: - "127.0.0.1:8080:8080" @@ -154,14 +154,14 @@ services: aonetwork-client: container_name: aonetwork-client - image: registry.ao.space/ao-space/gt:client-dev + image: registry.ao.space/ao-space/gt:client-v2.0.7 restart: always volumes: - /etc/ao-space/gt:/opt/config aospace-nginx: container_name: aospace-nginx - image: registry.ao.space/ao-space/space-web:dev + image: registry.ao.space/ao-space/space-web:v1.0.1 restart: always ports: - "9980:80" @@ -190,7 +190,7 @@ services: aospace-media-vod: container_name: aospace-media-vod - image: registry.ao.space/ao-space/space-media-vod:dev + image: registry.ao.space/ao-space/space-media-vod:v1.0.1 restart: always ports: - "127.0.0.1:3001:3001" diff --git a/res/docker-compose_run_as_docker_network_mode_host.yml b/res/docker-compose_run_as_docker_network_mode_host.yml index d9c62da..add845b 100644 --- a/res/docker-compose_run_as_docker_network_mode_host.yml +++ b/res/docker-compose_run_as_docker_network_mode_host.yml @@ -17,7 +17,7 @@ version: '2.4' services: aospace-postgresql: container_name: aospace-postgresql - image: registry.ao.space/ao-space/space-postgresql:dev + image: registry.ao.space/ao-space/space-postgresql:v1.0.1 restart: always healthcheck: test: pg_isready @@ -54,7 +54,7 @@ services: aospace-filepreview: container_name: aospace-filepreview - image: registry.ao.space/ao-space/space-filepreview:dev + image: registry.ao.space/ao-space/space-filepreview:v1.0.1 restart: always depends_on: aospace-redis: @@ -73,7 +73,7 @@ services: aospace-fileapi: container_name: aospace-fileapi - image: registry.ao.space/ao-space/space-aofs:dev + image: registry.ao.space/ao-space/space-aofs:v1.0.1 restart: always depends_on: aospace-postgresql: @@ -109,7 +109,7 @@ services: aospace-gateway: container_name: aospace-gateway - image: registry.ao.space/ao-space/space-gateway:dev + image: registry.ao.space/ao-space/space-gateway:v1.0.1 restart: always ports: - "127.0.0.1:8080:8080" @@ -151,7 +151,7 @@ services: aonetwork-client: container_name: aonetwork-client - image: registry.ao.space/ao-space/gt:client-dev + image: registry.ao.space/ao-space/gt:client-v2.0.7 restart: always network_mode: "host" volumes: @@ -159,7 +159,7 @@ services: aospace-nginx: container_name: aospace-nginx - image: registry.ao.space/ao-space/space-web:dev + image: registry.ao.space/ao-space/space-web:v1.0.1 restart: always network_mode: "host" # 以容器运行时，去掉了 host 网络。如果 nginx 和 network-client 指定 host 网络，那么这2个容器会处于 docker-desktop 的子网中，比如 192.168.65.x 的网络。和宿主机、还有 网关(ao-space) 网络隔离的。不容易相互访问。 @@ -184,7 +184,7 @@ services: aospace-media-vod: container_name: aospace-media-vod - image: registry.ao.space/ao-space/space-media-vod:dev + image: registry.ao.space/ao-space/space-media-vod:v1.0.1 restart: always ports: - "127.0.0.1:3001:3001"