Skip to content

Commit

Permalink
chore: move back to divideprojects
Browse files Browse the repository at this point in the history
  • Loading branch information
Divkix committed Jun 6, 2023
1 parent 6bda857 commit 89610d7
Show file tree
Hide file tree
Showing 10 changed files with 37 additions and 40 deletions.
13 changes: 5 additions & 8 deletions .deepsource.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,13 @@ version = 1
name = "docker"
enabled = true

[analyzers.meta]
dockerfile_paths = [
"Dockerfile",
"Dockerfile.caprover"
]
[analyzers.meta]
dockerfile_paths = ["Dockerfile", "goreleaser.Dockerfile"]

[[analyzers]]
name = "go"
enabled = true

[analyzers.meta]
import_root = "github.com/divkix/RestrictChannelRobot"
dependencies_vendored = true
[analyzers.meta]
import_root = "github.com/divideprojects/RestrictChannelRobot"
dependencies_vendored = true
40 changes: 20 additions & 20 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ release:
Welcome to this new release!
footer: |
Docker Images:
`docker.io/divkix/{{ .ProjectName }}:latest`
`ghcr.io/divkix/{{ .ProjectName }}:latest`
`docker.io/divideprojects/{{ .ProjectName }}:latest`
`ghcr.io/divideprojects/{{ .ProjectName }}:latest`
before:
hooks:
- go mod tidy
Expand All @@ -19,15 +19,15 @@ builds:
goarch:
- amd64
- arm64
mod_timestamp: '{{ .CommitTimestamp }}'
mod_timestamp: "{{ .CommitTimestamp }}"
flags:
- -trimpath
ldflags:
- -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{ .CommitDate }}
archives:
- format: binary
checksum:
name_template: 'checksums.txt'
name_template: "checksums.txt"
snapshot:
name_template: "{{ incpatch .Version }}-next"

Expand All @@ -37,8 +37,8 @@ dockers:
dockerfile: goreleaser.Dockerfile
use: buildx
image_templates:
- "docker.io/divkix/{{ .ProjectName }}:{{ .Tag }}-amd64"
- "ghcr.io/divkix/{{ .ProjectName }}:{{ .Tag }}-amd64"
- "docker.io/divideprojects/{{ .ProjectName }}:{{ .Tag }}-amd64"
- "ghcr.io/divideprojects/{{ .ProjectName }}:{{ .Tag }}-amd64"
build_flag_templates:
- "--platform=linux/amd64"
- "--pull"
Expand All @@ -51,8 +51,8 @@ dockers:
dockerfile: goreleaser.Dockerfile
use: buildx
image_templates:
- "docker.io/divkix/{{ .ProjectName }}:{{ .Tag }}-arm64v8"
- "ghcr.io/divkix/{{ .ProjectName }}:{{ .Tag }}-arm64v8"
- "docker.io/divideprojects/{{ .ProjectName }}:{{ .Tag }}-arm64v8"
- "ghcr.io/divideprojects/{{ .ProjectName }}:{{ .Tag }}-arm64v8"
build_flag_templates:
- "--platform=linux/arm64/v8"
- "--pull"
Expand All @@ -63,21 +63,21 @@ dockers:

docker_manifests:
# docker hub
- name_template: "docker.io/divkix/{{ .ProjectName }}:{{ .Version }}"
- name_template: "docker.io/divideprojects/{{ .ProjectName }}:{{ .Version }}"
image_templates:
- "docker.io/divkix/{{ .ProjectName }}:{{ .Tag }}-amd64"
- "docker.io/divkix/{{ .ProjectName }}:{{ .Tag }}-arm64v8"
- name_template: "docker.io/divkix/{{ .ProjectName }}:latest"
- "docker.io/divideprojects/{{ .ProjectName }}:{{ .Tag }}-amd64"
- "docker.io/divideprojects/{{ .ProjectName }}:{{ .Tag }}-arm64v8"
- name_template: "docker.io/divideprojects/{{ .ProjectName }}:latest"
image_templates:
- "docker.io/divkix/{{ .ProjectName }}:{{ .Tag }}-amd64"
- "docker.io/divkix/{{ .ProjectName }}:{{ .Tag }}-arm64v8"
- "docker.io/divideprojects/{{ .ProjectName }}:{{ .Tag }}-amd64"
- "docker.io/divideprojects/{{ .ProjectName }}:{{ .Tag }}-arm64v8"

# github container registry
- name_template: "ghcr.io/divkix/{{ .ProjectName }}:{{ .Version }}"
- name_template: "ghcr.io/divideprojects/{{ .ProjectName }}:{{ .Version }}"
image_templates:
- "ghcr.io/divkix/{{ .ProjectName }}:{{ .Tag }}-amd64"
- "ghcr.io/divkix/{{ .ProjectName }}:{{ .Tag }}-arm64v8"
- name_template: "ghcr.io/divkix/{{ .ProjectName }}:latest"
- "ghcr.io/divideprojects/{{ .ProjectName }}:{{ .Tag }}-amd64"
- "ghcr.io/divideprojects/{{ .ProjectName }}:{{ .Tag }}-arm64v8"
- name_template: "ghcr.io/divideprojects/{{ .ProjectName }}:latest"
image_templates:
- "ghcr.io/divkix/{{ .ProjectName }}:{{ .Tag }}-amd64"
- "ghcr.io/divkix/{{ .ProjectName }}:{{ .Tag }}-arm64v8"
- "ghcr.io/divideprojects/{{ .ProjectName }}:{{ .Tag }}-amd64"
- "ghcr.io/divideprojects/{{ .ProjectName }}:{{ .Tag }}-arm64v8"
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ CMD ["/RestrictChannelRobot"]

LABEL org.opencontainers.image.authors="Divanshu Chauhan <divkix@divkix.me>"
LABEL org.opencontainers.image.url="https://divkix.me"
LABEL org.opencontainers.image.source="https://github.com/divkix/RestrictChannelRobot"
LABEL org.opencontainers.image.source="https://github.com/divideprojects/RestrictChannelRobot"
LABEL org.opencontainers.image.title="Restrict Channel Robot"
LABEL org.opencontainers.image.description="Official Restrict Channel Bot Docker Image"
LABEL org.opencontainers.image.vendor="Divkix"
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

RestrictChannelRobot - A Telegram bot, to ban anonymous channels in group.
Copyright (C) 2021 Divkix
Copyright (C) 2021-2023 Divkix

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<img src="https://img.shields.io/github/license/DivideProjects/restrictchannelrobot?style=flat-square" alt="LICENSE">
<img src="https://img.shields.io/github/contributors/DivideProjects/restrictchannelrobot?style=flat-square" alt="Contributors">
<img src="https://img.shields.io/github/repo-size/DivideProjects/restrictchannelrobot?style=flat-square" alt="Repo Size">
<img src="https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https://github.com/divkix/restrictchannelrobot&amp;title=Profile%20Views" alt="Views">
<img src="https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https://github.com/divideprojects/RestrictChannelRobot&amp;title=Profile%20Views" alt="Views">
</p>

<p align='center'>
<a href="https://go.dev/" alt="made-with-go"> <img src="https://img.shields.io/badge/Made%20with-Go-1f425f.svg?style=flat-square&logo=go&color=blue" /> </a>
<a href="https://github.com/divkix/restrictchannelrobot" alt="Docker!"> <img src="https://img.shields.io/docker/pulls/divideprojects/restrictchannelrobot" /> </a>
<a href="https://github.com/divideprojects/RestrictChannelRobot" alt="Docker!"> <img src="https://img.shields.io/docker/pulls/divideprojects/restrictchannelrobot" /> </a>
<a href="https://hub.docker.com/r/divideprojects/restrictchannelrobot" alt="Docker Image Version"> <img src="https://img.shields.io/docker/v/divideprojects/restrictchannelrobot/latest" /> </a>
<a href="https://deepsource.io/gh/DivideProjects/restrictchannelrobot/?ref=repository-badge"><img src="https://static.deepsource.io/deepsource-badge-light-mini.svg" alt="DeepSource"></a>
</p>
Expand All @@ -35,7 +35,7 @@ Can be found on telegram as [@RestrictChannelRobot](https://telegram.dog/Restric

## Deploy via Heroku.
<p>
<a href="https://heroku.com/deploy?template=https://github.com/divkix/restrictchannelrobot"><img src="https://www.herokucdn.com/deploy/button.svg" alt="Deploy"></a>
<a href="https://heroku.com/deploy?template=https://github.com/divideprojects/RestrictChannelRobot"><img src="https://www.herokucdn.com/deploy/button.svg" alt="Deploy"></a>
</p>

## Support
Expand Down
2 changes: 1 addition & 1 deletion app.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"telegram anonymous channel",
"telegram group"
],
"repository": "https://github.com/divkix/RestrictChannelRobot",
"repository": "https://github.com/divideprojects/RestrictChannelRobot",
"website": "https://t.me/DivideProjects",
"success_url": "https://t.me/DivideProjects",
"env": {
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:
restrict-channel-bot:
image: ghcr.io/divkix/restrictchannelrobot:latest
image: ghcr.io/divideprojects/RestrictChannelRobot:latest
restart: always
container_name: restrict-channel-bot
environment:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/divkix/RestrictChannelRobot
module github.com/divideprojects/RestrictChannelRobot

// +heroku goVersion go1.19
go 1.19
Expand Down
2 changes: 1 addition & 1 deletion goreleaser.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ CMD ["/restrictchannelrobot"]

LABEL org.opencontainers.image.authors="Divanshu Chauhan <divkix@divkix.me>"
LABEL org.opencontainers.image.url="https://divkix.me"
LABEL org.opencontainers.image.source="https://github.com/divkix/RestrictChannelRobot"
LABEL org.opencontainers.image.source="https://github.com/divideprojects/RestrictChannelRobot"
LABEL org.opencontainers.image.title="Restrict Channel Robot"
LABEL org.opencontainers.image.description="Official Restrict Channel Bot Docker Image"
LABEL org.opencontainers.image.vendor="Divkix"
6 changes: 3 additions & 3 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ func start(bot *gotgbot.Bot, ctx *ext.Context) error {
{
{
Text: "Source",
Url: "https://github.com/divkix/RestrictChannelRobot",
Url: "https://github.com/divideprojects/RestrictChannelRobot",
},
},
},
Expand Down Expand Up @@ -218,7 +218,7 @@ func source(bot *gotgbot.Bot, ctx *ext.Context) error {

text = fmt.Sprintf(
"You can find my source code by <a href=\"%s\">here</a> or by clicking the button below.",
"https://github.com/divkix/RestrictChannelRobot",
"https://github.com/divideprojects/RestrictChannelRobot",
)

_, err := msg.Reply(
Expand All @@ -232,7 +232,7 @@ func source(bot *gotgbot.Bot, ctx *ext.Context) error {
{
{
Text: "Source Code",
Url: "https://github.com/divkix/RestrictChannelRobot",
Url: "https://github.com/divideprojects/RestrictChannelRobot",
},
},
},
Expand Down

0 comments on commit 89610d7

Please sign in to comment.