Skip to content

ci: test build #684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ body:
id: read_troubleshooting
attributes:
label: Have you read the troubleshooting page?
description: Can be found [here](https://github.com/bbernhard/signal-cli-rest-api/blob/master/doc/TROUBLESHOOTING.md)
description: Can be found [here](https://github.com/paprickar/signal-cli-rest-api/blob/master/doc/TROUBLESHOOTING.md)
options:
- label: "Yes"
- type: dropdown
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ jobs:
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
docker buildx create --name multibuilder
docker buildx use multibuilder
docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t bbernhard/signal-cli-rest-api:${VERSION}-ci .
docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t paprickar/signal-cli-rest-api:${VERSION}-ci .

2 changes: 1 addition & 1 deletion .github/workflows/release-dev-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ jobs:
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
docker buildx create --name multibuilder
docker buildx use multibuilder
docker buildx build --build-arg BUILD_VERSION_ARG=${VERSION} --platform linux/amd64,linux/arm64,linux/arm/v7 -t bbernhard/signal-cli-rest-api:${VERSION}-dev -t bbernhard/signal-cli-rest-api:latest-dev . --push
docker buildx build --build-arg BUILD_VERSION_ARG=${VERSION} --platform linux/amd64,linux/arm64,linux/arm/v7 -t paprickar/signal-cli-rest-api:${VERSION}-dev -t paprickar/signal-cli-rest-api:latest-dev . --push
2 changes: 1 addition & 1 deletion .github/workflows/release-productive-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ jobs:
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
docker buildx create --name multibuilder
docker buildx use multibuilder
docker buildx build --build-arg BUILD_VERSION_ARG=${VERSION} --platform linux/amd64,linux/arm64,linux/arm/v7 -t bbernhard/signal-cli-rest-api:${VERSION} -t bbernhard/signal-cli-rest-api:latest . --push
docker buildx build --build-arg BUILD_VERSION_ARG=${VERSION} --platform linux/amd64,linux/arm64,linux/arm/v7 -t paprickar/signal-cli-rest-api:${VERSION} -t paprickar/signal-cli-rest-api:latest . --push
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ $ mkdir -p $HOME/.local/share/signal-api

```bash
$ sudo docker run -d --name signal-api --restart=always -p 8080:8080 \
-v $HOME/.local/share/signal-api:/home/.local/share/signal-cli \
-e 'MODE=native' bbernhard/signal-cli-rest-api
-v $HOME/.local/share/signal-cli:/home/.local/share/signal-cli \
-e 'MODE=native' paprickar/signal-cli-rest-api
```

3. Register or Link your Signal Number
Expand Down Expand Up @@ -72,7 +72,7 @@ The `signal-cli-rest-api` supports three different modes of execution, which can
```bash
$ sudo docker run -d --name signal-api --restart=always -p 9922:8080 \
-v /home/user/signal-api:/home/.local/share/signal-cli \
-e 'MODE=native' bbernhard/signal-cli-rest-api
-e 'MODE=native' paprickar/signal-cli-rest-api
```

This launches a instance of the REST service accessible under http://localhost:9922/v2/send. To preserve the Signal number registration, i.e. for updates, the storage location for the `signal-cli` configuration is mapped as Docker Volume into a local `/home/user/signal-api` directory.
Expand All @@ -94,7 +94,7 @@ Sample `docker-compose.yml`file:
version: "3"
services:
signal-cli-rest-api:
image: bbernhard/signal-cli-rest-api:latest
image: paprickar/signal-cli-rest-api:latest
environment:
- MODE=normal #supported modes: json-rpc, native, normal
#- AUTO_RECEIVE_SCHEDULE=0 22 * * * #enable this parameter on demand (see description below)
Expand All @@ -108,7 +108,7 @@ services:

### API Reference

The Swagger API documentation can be found [here](https://bbernhard.github.io/signal-cli-rest-api/). If you prefer a simple text file based API documentation have a look [here](https://github.com/bbernhard/signal-cli-rest-api/blob/master/doc/EXAMPLES.md).
The Swagger API documentation can be found [here](https://bbernhard.github.io/signal-cli-rest-api/). If you prefer a simple text file based API documentation have a look [here](https://github.com/paprickar/signal-cli-rest-api/blob/master/doc/EXAMPLES.md).

### Blog Posts

Expand Down
6 changes: 3 additions & 3 deletions doc/DEV.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# How to run a ARM64 docker on a x86-64 system

* run `docker run --rm --privileged multiarch/qemu-user-static --reset -p yes`
* pull image with `docker image pull bbernhard/signal-cli-rest-api@sha256:<SHA256 HASH>`
(e.g: `docker image pull bbernhard/signal-cli-rest-api@sha256:e0a30fa5c2b2ff5fb21827352a0fa94c6c6fbb3a21a944cc5405c390e143e65b`; the SHA256 HASH can be found on dockerhub)
* run container with `docker run bbernhard/signal-cli-rest-api@sha256:<SHA256 HASH>`
* pull image with `docker image pull paprickar/signal-cli-rest-api@sha256:<SHA256 HASH>`
(e.g: `docker image pull paprickar/signal-cli-rest-api@sha256:e0a30fa5c2b2ff5fb21827352a0fa94c6c6fbb3a21a944cc5405c390e143e65b`; the SHA256 HASH can be found on dockerhub)
* run container with `docker run paprickar/signal-cli-rest-api@sha256:<SHA256 HASH>`
2 changes: 1 addition & 1 deletion doc/HOMEASSISTANT.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ See also the [documentation of the Home Assistant integration](https://www.home-
version: "3"
services:
signal-cli-rest-api:
image: bbernhard/signal-cli-rest-api:latest
image: paprickar/signal-cli-rest-api:latest
environment:
- MODE=json-rpc #supported modes: json-rpc, native, normal. json-prc is recommended for speed
ports:
Expand Down
2 changes: 1 addition & 1 deletion doc/OCTOPRINT.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ prerequisites:
version: "3"
services:
signal-cli-rest-api:
image: bbernhard/signal-cli-rest-api:latest
image: paprickar/signal-cli-rest-api:latest
environment:
- MODE=json-rpc #supported modes: json-rpc, native, normal
ports:
Expand Down
2 changes: 1 addition & 1 deletion doc/TROUBLESHOOTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The signal-cli-rest-api docker container won't start (signal_messenger_signal-cli-rest-api_1 exited with code 0)

If your docker container stops with `signal_messenger_signal-cli-rest-api_1 exited with code 0`, make sure that the host port isn't already occupied by another process (see [here](https://github.com/bbernhard/signal-cli-rest-api/issues/2)).
If your docker container stops with `signal_messenger_signal-cli-rest-api_1 exited with code 0`, make sure that the host port isn't already occupied by another process (see [here](https://github.com/paprickar/signal-cli-rest-api/issues/2)).

# Sending a message suceeds, but no message is sent

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3"
services:
signal-cli-rest-api:
image: bbernhard/signal-cli-rest-api:latest
image: paprickar/signal-cli-rest-api:latest
environment:
- MODE=normal #supported modes: json-rpc, native, normal
#- AUTO_RECEIVE_SCHEDULE=0 22 * * * #enable this parameter on demand (see description below)
Expand Down
4 changes: 2 additions & 2 deletions publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ case "$response" in
[yY][eE][sS]|[yY])

if [[ "$TAG" == "stable" ]]; then
curl --request POST --url 'https://api.github.com/repos/bbernhard/signal-cli-rest-api/actions/workflows/6006444/dispatches' --header 'authorization: Bearer '"$SIGNAL_CLI_GITHUB_ACTIONS_TOKEN"'' --data '{"ref": "'"$branch_name"'", "inputs": {"version": "'"$VERSION"'"}}'
curl --request POST --url 'https://api.github.com/repos/paprickar/signal-cli-rest-api/actions/workflows/6006444/dispatches' --header 'authorization: Bearer '"$SIGNAL_CLI_GITHUB_ACTIONS_TOKEN"'' --data '{"ref": "'"$branch_name"'", "inputs": {"version": "'"$VERSION"'"}}'
echo "Successfully triggered Github Actions Job"
fi

if [[ "$TAG" == "dev" ]]; then
curl --request POST --url 'https://api.github.com/repos/bbernhard/signal-cli-rest-api/actions/workflows/6006443/dispatches' --header 'authorization: Bearer '"$SIGNAL_CLI_GITHUB_ACTIONS_TOKEN"'' --data '{"ref": "'"$branch_name"'", "inputs": {"version": "'"$VERSION"'"}}'
curl --request POST --url 'https://api.github.com/repos/paprickar/signal-cli-rest-api/actions/workflows/6006443/dispatches' --header 'authorization: Bearer '"$SIGNAL_CLI_GITHUB_ACTIONS_TOKEN"'' --data '{"ref": "'"$branch_name"'", "inputs": {"version": "'"$VERSION"'"}}'
echo "Successfully triggered Github Actions Job"
fi

Expand Down
6 changes: 3 additions & 3 deletions src/api/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
"github.com/gorilla/websocket"
log "github.com/sirupsen/logrus"

"github.com/bbernhard/signal-cli-rest-api/client"
ds "github.com/bbernhard/signal-cli-rest-api/datastructs"
utils "github.com/bbernhard/signal-cli-rest-api/utils"
"github.com/paprickar/signal-cli-rest-api/client"
ds "github.com/paprickar/signal-cli-rest-api/datastructs"
utils "github.com/paprickar/signal-cli-rest-api/utils"
)

const (
Expand Down
5 changes: 3 additions & 2 deletions src/client/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ import (
"bufio"
"bytes"
"errors"
utils "github.com/bbernhard/signal-cli-rest-api/utils"
log "github.com/sirupsen/logrus"
"os/exec"
"strings"
"time"

utils "github.com/paprickar/signal-cli-rest-api/utils"
log "github.com/sirupsen/logrus"
)

type CliClient struct {
Expand Down
7 changes: 4 additions & 3 deletions src/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,22 @@ import (
"encoding/json"
"errors"
"fmt"
log "github.com/sirupsen/logrus"
"io/ioutil"
"os"
"path/filepath"
"strconv"
"strings"

log "github.com/sirupsen/logrus"

securejoin "github.com/cyphar/filepath-securejoin"
"github.com/h2non/filetype"

uuid "github.com/gofrs/uuid"
qrcode "github.com/skip2/go-qrcode"

ds "github.com/bbernhard/signal-cli-rest-api/datastructs"
utils "github.com/bbernhard/signal-cli-rest-api/utils"
ds "github.com/paprickar/signal-cli-rest-api/datastructs"
utils "github.com/paprickar/signal-cli-rest-api/utils"
)

const groupPrefix = "group."
Expand Down
2 changes: 1 addition & 1 deletion src/client/jsonrpc2.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"sync"
"time"

"github.com/bbernhard/signal-cli-rest-api/utils"
uuid "github.com/gofrs/uuid"
"github.com/paprickar/signal-cli-rest-api/utils"
log "github.com/sirupsen/logrus"
"github.com/tidwall/sjson"
)
Expand Down
2 changes: 1 addition & 1 deletion src/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/bbernhard/signal-cli-rest-api
module github.com/paprickar/signal-cli-rest-api

go 1.14

Expand Down
17 changes: 9 additions & 8 deletions src/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,20 @@ package main
import (
"encoding/json"
"flag"
"github.com/bbernhard/signal-cli-rest-api/api"
"github.com/bbernhard/signal-cli-rest-api/client"
docs "github.com/bbernhard/signal-cli-rest-api/docs"
"github.com/bbernhard/signal-cli-rest-api/utils"
"io/ioutil"
"net/http"
"os"
"strconv"

"github.com/gin-gonic/gin"
"github.com/paprickar/signal-cli-rest-api/api"
"github.com/paprickar/signal-cli-rest-api/client"
docs "github.com/paprickar/signal-cli-rest-api/docs"
"github.com/paprickar/signal-cli-rest-api/utils"
"github.com/robfig/cron/v3"
log "github.com/sirupsen/logrus"
swaggerFiles "github.com/swaggo/files"
ginSwagger "github.com/swaggo/gin-swagger"
"io/ioutil"
"net/http"
"os"
"strconv"
)

// @title Signal Cli REST API
Expand Down
7 changes: 3 additions & 4 deletions src/scripts/jsonrpc2-helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ package main

import (
"fmt"
"github.com/bbernhard/signal-cli-rest-api/utils"
log "github.com/sirupsen/logrus"
"io/ioutil"
"os"
"os/exec"
"strings"

"github.com/paprickar/signal-cli-rest-api/utils"
log "github.com/sirupsen/logrus"
)

const supervisorctlConfigTemplate = `
Expand Down Expand Up @@ -70,10 +71,8 @@ func main() {
//write supervisorctl config
supervisorctlConfigFilename := "/etc/supervisor/conf.d/" + "signal-cli-json-rpc-1.conf"


supervisorctlConfig := fmt.Sprintf(supervisorctlConfigTemplate, supervisorctlProgramName, supervisorctlProgramName,
tcpPort, fifoPathname, signalCliConfigDir, fifoPathname, supervisorctlProgramName, supervisorctlProgramName)


err = ioutil.WriteFile(supervisorctlConfigFilename, []byte(supervisorctlConfig), 0644)
if err != nil {
Expand Down