mo

.github/workflows/go.yml → .github/workflows/build-release.yml

@@ -1,57 +1,62 @@
-name: Go
+name: release build
 on:
-  push:
+  create:
     tags:
-    - '*'
+      - '1.*'
 
 jobs:
-
   build:
+    if: ${{ github.owner }} == "boypt"
     name: Build
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go
-      uses: actions/setup-go@v1
-      with:
-        go-version: 1.16.x
-
     - name: Check out code
       uses: actions/checkout@v2
       with:
         ref: 'master'
         fetch-depth: '0'
 
-    - name: Generate Git log
-      run: |
-        git fetch origin +refs/tags/*:refs/tags/*
-        echo "Current Tag: ${GITHUB_REF}"
-        git checkout ${GITHUB_REF} -b compile
-        GITVER=$(git describe --tags)
-        PREVVER=$(git describe --tags --abbrev=0 ${GITVER}~1)
-        git log --oneline ${PREVVER}..${GITVER} > gittaglogs.txt
+    - name: Set up Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: "^1.17"
 
     - name: Get dependencies
       run: |
-        go get -v -t -d ./...
+        go mod download -x
 
     - name: Build
       run: |
         bash scripts/make_release.sh gzip amd64
-        bash scripts/make_release.sh gzip amd64 purego
+        bash scripts/make_release.sh gzip amd64 static
+        bash scripts/make_release.sh gzip 386 purego
         bash scripts/make_release.sh gzip arm64 purego
-
+        bash scripts/make_release.sh gzip darwin purego
+
+    - name: Generate Git Log
+      run: |
+        go version
+        git fetch origin +refs/tags/*:refs/tags/*
+        echo "Current Tag: ${GITHUB_REF}"
+        git checkout ${GITHUB_REF} -b compile
+        GITVER=$(git describe --tags)
+        PREVVER=$(git describe --tags --abbrev=0 ${GITVER}~1)
+        echo git log --oneline ${PREVVER}..${GITVER} | tee -a gittaglogs.txt
+        git log --oneline ${PREVVER}..${GITVER} | tee -a gittaglogs.txt
+
     - name: Release
       uses: softprops/action-gh-release@v1
       if: startsWith(github.ref, 'refs/tags/')
       with:
         files: |
           cloud-torrent_linux_amd64.gz
           cloud-torrent_linux_amd64_static.gz
+          cloud-torrent_linux_386_static.gz
           cloud-torrent_linux_arm64_static.gz
-        prerelease: true
-        draft: false
+          cloud-torrent_darwin_amd64_static.gz
+        prerelease: false
+        draft: true
         body_path: gittaglogs.txt
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-

.github/workflows/docker-push.yml

@@ -0,0 +1,51 @@
+name: docker build
+on:
+  create:
+    tags:
+      - '1.*'
+
+jobs:
+  build:
+    if: ${{ github.owner }} == "boypt"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout codebase
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Setup QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Get tag to build
+        id: tag
+        run: |
+          latest_tag=$(git describe --tags | cut -d- -f1)
+          echo "Use the latest release tag: ${latest_tag}"
+          echo ::set-output name=tag::${latest_tag}
+
+      - name: Prepare environment variables
+        id: prepare
+        run: |
+          echo ::set-output name=docker_platforms::linux/386,linux/amd64,linux/arm64
+          echo ::set-output name=docker_image::boypt/cloud-torrent
+          echo ::set-output name=docker_tag::${{ steps.tag.outputs.tag }}
+          echo ::set-output name=docker_is_push::${PUSH:-false}
+
+      - name: Build tag & latest release
+        run: |
+          docker buildx build --platform ${{ steps.prepare.outputs.docker_platforms }} \
+          --output "type=image,push=true" \
+          --tag "${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.docker_tag }}" \
+          --tag "${{ steps.prepare.outputs.docker_image }}:latest" \
+          --build-arg TAG=${{ steps.prepare.outputs.docker_tag }} \
+          --file Dockerfile .

.github/workflows/lint.yml

@@ -0,0 +1,18 @@
+---
+name: lint
+on: [push, pull_request]
+jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - name: Run linter
+        uses: golangci/golangci-lint-action@v2
+        with:
+          version: v1.42.1

.gitignore

@@ -2,6 +2,8 @@ vendor
 downloads
 torrents
 cloud-torrent*
+simple-torrent*
 tmp/
+play*.yml
 .vscode
 .torrent.bolt.db

Dockerfile

@@ -2,21 +2,18 @@
 # STEP 1 build executable binary
 ############################
 FROM golang:alpine AS builder
-RUN apk update && apk add --no-cache git
+RUN apk update && apk add --no-cache git make build-base
 WORKDIR /root/cloud-torrent
 ENV PATH=$HOME/go/bin:$PATH 
-RUN git clone https://github.com/boypt/cloud-torrent.git . && \
-    go get -v -u github.com/shuLhan/go-bindata/... && \
-    go get -v -t -d ./... && \
-    cd static && \
-    sh generate.sh
+ENV CGO_ENABLED=1
+RUN git clone https://github.com/boypt/simple-torrent.git . && \
+    go get -v -t -d .
 
-ENV GO111MODULE=on CGO_ENABLED=0
-RUN go build -ldflags "-s -w -X main.VERSION=$(git describe --tags)" -o /usr/local/bin/cloud-torrent
+RUN go build -trimpath -ldflags "-s -w -X main.VERSION=$(git describe --tags)" -o /usr/local/bin/cloud-torrent
 ############################
 # STEP 2 build a small image
 ############################
 FROM alpine
 COPY --from=builder /usr/local/bin/cloud-torrent /usr/local/bin/cloud-torrent
-RUN apk update && apk add ca-certificates
+RUN apk update && apk add ca-certificates libstdc++
 ENTRYPOINT ["cloud-torrent"]

Makefile

@@ -1,9 +1,19 @@
-bin=cloud-torrent
-.PHONY: clean
-all: clean $(bin)
+app_name = simple-torrent
 
-cloud-torrent:
-	CGO_ENABLED=0 go build -o $(bin) -ldflags "-s -w -X main.VERSION=$$(git describe --tags)"
+build: get
+	CGO_ENABLED=0 go build -ldflags "-X main.VERSION=`git rev-parse --short HEAD`" -o $(app_name)
+
+static: get
+	go build -tags "netgo,osusergo,sqlite_omit_load_extension" -ldflags "-X main.VERSION=`git rev-parse --short HEAD` -linkmode external -extldflags "-static" " -o $(app_name)
+
+get:
+	go mod download
+
+run:
+	go run .
+
+test:
+	go test ./... -v
 
 clean:
-	rm -fv $(bin)
+	rm -f $(app_name)

README.md

@@ -34,29 +34,36 @@ Also:
 
 ## Binary
 
-See [the latest release](https://github.com/boypt/cloud-torrent/releases/latest) or use the oneline script to do a quick install on modern Linux.
+See [the latest release](https://github.com/boypt/cloud-torrent/releases/latest) or use the oneline script to do a quick install on a modern Linux machines.
 
+``` bash
+bash <(wget -qO- https://git.io/simpletorrentqs)
 ```
-bash <(wget -qO- https://raw.githubusercontent.com/boypt/simple-torrent/master/scripts/quickinstall.sh)
-```
 
-The script install a systemd unit (under `scripts/cloud-torrent.service`) as service. Read further intructions: [Auth And Security](https://github.com/boypt/simple-torrent/wiki/AuthSecurity)
+The script installs a systemd unit (under `scripts/cloud-torrent.service`) as service. Read further intructions: [Auth And Security](https://github.com/boypt/simple-torrent/wiki/AuthSecurity)
+
+If hope to specify a version, just append the version number to the command.
 
-## Docker [![Docker Pulls](https://img.shields.io/docker/pulls/boypt/cloud-torrent.svg)][dockerhub] [![Image Size](https://images.microbadger.com/badges/image/boypt/cloud-torrent.svg)][dockerhub]
+``` bash
+bash <(wget -qO- https://git.io/simpletorrentqs) 1.3.3
+```
+
+## Docker [![Docker Pulls](https://img.shields.io/docker/pulls/boypt/cloud-torrent.svg)][dockerhub]
 
 [dockerhub]: https://hub.docker.com/r/boypt/cloud-torrent/
 
-``` sh
+``` bash
 $ docker run -d -p 3000:3000 -v /path/to/my/downloads:/downloads -v /path/to/my/torrents:/torrents boypt/cloud-torrent
 ```
 When running as a container, keep in mind:
 * You need also to expose your torrent incoming port (50007 by default) if you want to seed (`-p 50007:50007`). Also, you'll have to forward the port on your router.
 * Automatic port forwarding on your router via UPnP IGD will not work unless run in `host` mode (`--net=host`).
 
+It's more practical to run docker-compose, see Wiki Page: [DockerCompose](https://github.com/boypt/simple-torrent/wiki/DockerCompose)
 ## Source
 
 **Requirement**
-- Latest [Golang](https://golang.org/dl/) (Go 1.13+)
+- Latest [Golang](https://golang.org/dl/) (Go 1.16+)
 
 ``` sh
 $ git clone https://github.com/boypt/simple-torrent.git

common/utils.go

@@ -0,0 +1,36 @@
+package common
+
+import (
+	"log"
+	"runtime"
+)
+
+func HandleError(err error) (b bool) {
+	if err != nil {
+		// notice that we're using 1, so it will actually log where
+		// the error happened, 0 = this function, we don't want that.
+		_, fn, line, _ := runtime.Caller(1)
+		log.Printf("[error] %s:%d %v", fn, line, err)
+		b = true
+	}
+	return
+}
+
+//this logs the function name as well.
+func FancyHandleError(err error) (b bool) {
+	if err != nil {
+		// notice that we're using 1, so it will actually log the where
+		// the error happened, 0 = this function, we don't want that.
+		pc, fn, line, _ := runtime.Caller(1)
+
+		log.Printf("[error] in %s[%s:%d] %v", runtime.FuncForPC(pc).Name(), fn, line, err)
+		b = true
+	}
+	return
+}
+
+func Must(err error) {
+	if err != nil {
+		panic(err)
+	}
+}

docker-compose.yml

@@ -1,13 +1,16 @@
-version: '3.3'
+version: '3'
 services:
-    cloud-torrent:
-#        network_mode: host
-        ports:
-            - '3000:3000'
-#            - '50007:50007'
-        volumes:
-            - '/path/to/my/downloads:/downloads'
-            - '/path/to/my/torrents:/torrents'
-            - '/path/to/my/config:/etc/cloud-torrent'
-        image: boypt/cloud-torrent
-        command: --auth username:password
+  service.simpletorrent:
+    image: boypt/cloud-torrent
+    restart: unless-stopped
+    ports:
+      - "3000:3000"
+      - "50012:50012"
+      - "50012:50012/udp"
+    environment:
+      AUTH: "username:password"
+      TITLE: "MySimpleTorrent"
+    volumes:
+      - ./downloads:/srv/downloads
+      - ./cloud-torrent.yaml:/etc/cloud-torrent.yaml
+    command: ["-c", "/etc/cloud-torrent.yaml"]