Merge branch 'develop'

Author: jamiesun

.github/workflows/docker-publish.yml

@@ -44,7 +44,7 @@ jobs:
           context: ./
           # Note: tags has to be all lower-case
           tags: |
-            ca17/teamsacs:latest 
+            ca17/teamsacs:latest-amd64 
             ghcr.io/ca17/teamsacs/teamsacs:latest
           # build on feature branches, push only on main branch
           push: ${{ github.ref == 'refs/heads/main' }}

Makefile

@@ -30,14 +30,30 @@ fastpubm1:
 	make buildpre
 	make build
 	docker buildx build --platform=linux/amd64 --build-arg BTIME="$(shell date "+%F %T")" -t teamsacs . -f Dockerfile.local
-	docker tag teamsacs ${BUILD_ORG}/teamsacs:latest
-	docker push ${BUILD_ORG}/teamsacs:latest
+	docker tag teamsacs ${BUILD_ORG}/teamsacs:latest-amd64
+	docker push ${BUILD_ORG}/teamsacs:latest-amd64
+	make buildarm64
+	docker buildx build --platform=linux/arm64 --build-arg BTIME="$(shell date "+%F %T")" -t teamsacs . -f Dockerfile.local
+	docker tag teamsacs ${BUILD_ORG}/teamsacs:latest-arm64
+	docker push ${BUILD_ORG}/teamsacs:latest-arm64
+	docker manifest create ${BUILD_ORG}/teamsacs:latest ${BUILD_ORG}/teamsacs:latest-arm64 ${BUILD_ORG}/teamsacs:latest-amd64
+	# 标注不同架构镜像
+	docker manifest annotate ${BUILD_ORG}/teamsacs:latest ${BUILD_ORG}/teamsacs:latest-amd64 --os linux --arch amd64
+	docker manifest annotate ${BUILD_ORG}/teamsacs:latest ${BUILD_ORG}/teamsacs:latest-arm64 --os linux --arch arm64
+	# 推送镜像
+	docker manifest push ${BUILD_ORG}/teamsacs:latest
+
 
 build:
 	test -d ./release || mkdir -p ./release
 	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -ldflags  '-s -w -extldflags "-static"'  -o ./release/teamsacs main.go
 	upx ./release/teamsacs
 
+buildarm64:
+	test -d ./release || mkdir -p ./release
+	CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -a -ldflags  '-s -w -extldflags "-static"'  -o ./release/teamsacs main.go
+	upx ./release/teamsacs
+
 syncdev:
 	make buildpre
 	@read -p "提示:同步操作尽量在完成一个完整功能特性后进行，请输入提交描述 (develop):  " cimsg; \

README.md

@@ -33,7 +33,7 @@ and supports backup restoration via TR069.
 - Provide basic equipment information and status data query API, and data maintenance API.
 - Provide various policy management APIs, such as firewall rules, routing tables, etc.
 
-# Install and config
+# Quick Start
 
 TeamsACS uses PostgreSQL as its primary database and uses the Timescaledb extension
 
@@ -45,22 +45,40 @@ TeamsACS uses PostgreSQL as its primary database and uses the Timescaledb extens
 
     GRANT ALL PRIVILEGES ON DATABASE teamsacs TO teamsacs;
 
+
+- Install TeamsACS 
+
+The following installation method will download and build the latest teamsacs version
+
+```
+go install github.com/ca17/teamsacs@latest
+
+teamsacs -install
+
+```
+
+> If you want to download the compiled binaries directly, you can visit [Github Release](https://github.com/CA17/TeamsACS/releases)
+
+- Config TeamsACS
+
+Modifying configuration file [/etc/teamsacs.yml](Configuration)
+
 # Docker Deploy
 
 ```yml
-version: "2"
+version: "3"
 services:
   pgdb:
     image: timescale/timescaledb:latest-pg14
     container_name: "pgdb"
     ports:
-      - "127.0.0.1:5432:5432"
+      - "127.0.0.1:15432:5432"
     environment:
       POSTGRES_DB: teamsacs
       POSTGRES_USER: teamsacs
       POSTGRES_PASSWORD: teamsacs
     volumes:
-      - /data/pgdata:/var/lib/postgresql/data
+      - pgdb-volume:/var/lib/postgresql/data
     networks:
       teamsacs_network:
 
@@ -75,11 +93,12 @@ services:
       - "2989:2989"
       - "2999:2999"
     volumes:
-      - /data/teamsacs:/var/teamsacs
+      - teamsacs-volume:/var/teamsacs
     environment:
       - GODEBUG=x509ignoreCN=0
       - TEAMSACS_DB_HOST=pgdb
       - TEAMSACS_DB_PORT=5432
+      - TEAMSACS_DB_NAME=teamsacs
       - TEAMSACS_DB_USER=teamsacs
       - TEAMSACS_DB_PWD=teamsacs
       - TEAMSACS_WEB_DEBUG=1
@@ -89,6 +108,10 @@ services:
 networks:
   teamsacs_network:
 
+volumes:
+  pgdb-volume:
+  teamsacs-volume:
+
 ```
 
 ## Links

assets/buildinfo.txt

@@ -1,8 +1,8 @@
-BuildVersion=latest v1.0.1 2023-02-13 01:16:53
+BuildVersion=latest v1.0.1 2023-02-13 02:30:39
 ReleaseVersion=v1.0.1
-BuildTime=2023-02-13 01:16:53
+BuildTime=2023-02-13 02:30:39
 BuildName=teamsacs
-CommitID=bfe97f08e2b1906a53ab144abde554b4bdfb6c5f
-CommitDate=Mon, 13 Feb 2023 00:32:44 +0800
+CommitID=85825bd37d3b937a287c508cbc74d17234f7246c
+CommitDate=Mon, 13 Feb 2023 01:17:04 +0800
 [email protected]
-CommitSubject= : log err fix
+CommitSubject= : ci config

docker-compose.yml

@@ -0,0 +1,45 @@
+version: "3"
+services:
+  pgdb:
+    image: timescale/timescaledb:latest-pg14
+    container_name: "pgdb"
+    ports:
+      - "127.0.0.1:15432:5432"
+    environment:
+      POSTGRES_DB: teamsacs
+      POSTGRES_USER: teamsacs
+      POSTGRES_PASSWORD: teamsacs
+    volumes:
+      - pgdb-volume:/var/lib/postgresql/data
+    networks:
+      teamsacs_network:
+
+  teamsacs:
+    depends_on:
+      - 'pgdb'
+    image: ca17/teamsacs:latest
+    container_name: "teamsacs"
+    restart: always
+    ports:
+      - "2979:2979"
+      - "2989:2989"
+      - "2999:2999"
+    volumes:
+      - teamsacs-volume:/var/teamsacs
+    environment:
+      - GODEBUG=x509ignoreCN=0
+      - TEAMSACS_DB_HOST=pgdb
+      - TEAMSACS_DB_PORT=5432
+      - TEAMSACS_DB_NAME=teamsacs
+      - TEAMSACS_DB_USER=teamsacs
+      - TEAMSACS_DB_PWD=teamsacs
+      - TEAMSACS_WEB_DEBUG=1
+    networks:
+      teamsacs_network:
+
+networks:
+  teamsacs_network:
+
+volumes:
+  pgdb-volume:
+  teamsacs-volume: