diff --git a/.github/workflows/deploy_backend.yml b/.github/workflows/deploy_backend.yml index 7178ec8..4a18087 100644 --- a/.github/workflows/deploy_backend.yml +++ b/.github/workflows/deploy_backend.yml @@ -49,7 +49,7 @@ jobs: username: root password: ${{ secrets.PASS_1 }} port: 22 - source: "backend-image.tar,backend/configs/config.yaml" + source: "backend-image.tar" target: "/opt/license-manager/" - name: Deploy to server @@ -73,18 +73,11 @@ jobs: docker rmi ${{ env.IMAGE_NAME }}:old || true docker tag ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:old || true - # Ensure config file exists - if [ ! -f config.yaml ] && [ -f backend/configs/config.yaml ]; then - cp backend/configs/config.yaml config.yaml - echo "Copied config.yaml from backend configs." - fi - # Run new container with host network docker run -d \ --name ${{ env.CONTAINER_NAME }} \ --restart unless-stopped \ --network host \ - -v /opt/license-manager/config.yaml:/app/config.yaml \ -v /opt/license-manager/logs:/app/logs \ ${{ env.IMAGE_NAME }}:latest diff --git a/Dockerfile.backend b/Dockerfile.backend index 0b731b0..c898cb6 100644 --- a/Dockerfile.backend +++ b/Dockerfile.backend @@ -10,7 +10,7 @@ FROM alpine:latest RUN apk --no-cache add ca-certificates tzdata WORKDIR /app COPY --from=builder /app/backend/license-manager . -COPY backend/configs/config.example.yaml ./config.example.yaml +COPY backend/configs/config.yaml ./config.yaml COPY backend/configs/i18n/ ./configs/i18n/ EXPOSE 18888 CMD ["./license-manager"] \ No newline at end of file diff --git a/backend/docs/install/swagger_install.md b/backend/docs/install/swagger_install.md index d162ec9..2ab3e13 100644 --- a/backend/docs/install/swagger_install.md +++ b/backend/docs/install/swagger_install.md @@ -38,4 +38,4 @@ swag fmt # 验证swagger注释 swag init --parseVendor -g cmd/main.go -``` \ No newline at end of file +```