rename repo, snapcraft

japami · Apr 15, 2020 · 1caa1d9 · 1caa1d9
1 parent 8f401e0
commit 1caa1d9
Show file tree

Hide file tree

Showing 16 changed files with 44 additions and 57 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -20,4 +20,4 @@ A clear and concise description of what you expected to happen.
 ### Screenshots
 If applicable, add screenshots to help explain your problem.
 
-[![Slack](https://slack.statping.com/badge.svg)](https://slack.statping.com/) [![GitHub release](https://img.shields.io/github/release/hunterlong/statping.svg)](https://github.com/statping/statping/releases/latest) [![Build Status](https://travis-ci.com/hunterlong/statping.svg?branch=master)](https://travis-ci.com/hunterlong/statping)
+[![Slack](https://slack.statping.com/badge.svg)](https://slack.statping.com/) [![GitHub release](https://img.shields.io/github/release/statping/statping.svg)](https://github.com/statping/statping/releases/latest) [![Build Status](https://travis-ci.com/statping/statping.svg?branch=master)](https://travis-ci.com/hunterlong/statping)
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -19,4 +19,4 @@ I'm always frustrated when [...]
 ### Additional context
 Add any other context or screenshots about the feature request here.
 
-[![Slack](https://slack.statping.com/badge.svg)](https://slack.statping.com/) [![GitHub release](https://img.shields.io/github/release/hunterlong/statping.svg)](https://github.com/statping/statping/releases/latest) [![Build Status](https://travis-ci.com/hunterlong/statping.svg?branch=master)](https://travis-ci.com/hunterlong/statping)
+[![Slack](https://slack.statping.com/badge.svg)](https://slack.statping.com/) [![GitHub release](https://img.shields.io/github/release/statping/statping.svg)](https://github.com/statping/statping/releases/latest) [![Build Status](https://travis-ci.com/hunterlong/statping.svg?branch=master)](https://travis-ci.com/hunterlong/statping)
diff --git a/Makefile b/Makefile
@@ -270,38 +270,25 @@ sign-all:
 valid-sign:
 	gpg --verify statping.asc
 
-# install xgo and pull the xgo docker image
-xgo-install: clean
-	go get github.com/crazy-max/xgo
-	docker pull crazymax/xgo:${GOVERSION}
-
 sentry-release:
 	sentry-cli releases new -p backend -p frontend v${VERSION}
 	sentry-cli releases set-commits --auto v${VERSION}
 	sentry-cli releases finalize v${VERSION}
 
-snapcraft: clean snapcraft-build snapcraft-release
-
-snapcraft-build: build-all
+snapcraft: clean compile build-bin
 	PWD=$(shell pwd)
-	cp build/$(BINARY_NAME)-linux-x64.tar.gz build/$(BINARY_NAME)-linux.tar.gz
 	snapcraft clean statping -s pull
-	docker run --rm -v ${PWD}:/build -w /build --env VERSION=${VERSION} snapcore/snapcraft bash -c "apt update && snapcraft --target-arch=amd64"
-	cp build/$(BINARY_NAME)-linux-x32.tar.gz build/$(BINARY_NAME)-linux.tar.gz
+	docker run --rm -v ${PWD}/build/statping-linux-amd64.tar.gz:/build/statping-linux.tar.gz -w /build --env VERSION=${VERSION} snapcore/snapcraft bash -c "apt update && snapcraft --target-arch=amd64"
 	snapcraft clean statping -s pull
-	docker run --rm -v ${PWD}:/build -w /build --env VERSION=${VERSION} snapcore/snapcraft bash -c "apt update && snapcraft --target-arch=i386"
-	cp build/$(BINARY_NAME)-linux-arm64.tar.gz build/$(BINARY_NAME)-linux.tar.gz
+	docker run --rm -v ${PWD}/build/statping-linux-386.tar.gz:/build/statping-linux.tar.gz -w /build --env VERSION=${VERSION} snapcore/snapcraft bash -c "apt update && snapcraft --target-arch=i386"
 	snapcraft clean statping -s pull
-	docker run --rm -v ${PWD}:/build -w /build --env VERSION=${VERSION} snapcore/snapcraft bash -c "apt update && snapcraft --target-arch=arm64"
-	cp build/$(BINARY_NAME)-linux-arm7.tar.gz build/$(BINARY_NAME)-linux.tar.gz
+	docker run --rm -v ${PWD}/build/statping-linux-arm64.tar.gz:/build/statping-linux.tar.gz -w /build --env VERSION=${VERSION} snapcore/snapcraft bash -c "apt update && snapcraft --target-arch=arm64"
 	snapcraft clean statping -s pull
-	docker run --rm -v ${PWD}:/build -w /build --env VERSION=${VERSION} snapcore/snapcraft bash -c "apt update && snapcraft --target-arch=armhf"
-	rm -f build/$(BINARY_NAME)-linux.tar.gz
-
-snapcraft-release:
+	docker run --rm -v ${PWD}/build/statping-linux-arm.tar.gz:/build/statping-linux.tar.gz -w /build --env VERSION=${VERSION} snapcore/snapcraft bash -c "apt update && snapcraft --target-arch=armhf"
+	snapcraft push statping_${VERSION}_amd64.snap --release stable
 	snapcraft push statping_${VERSION}_arm64.snap --release stable
 	snapcraft push statping_${VERSION}_i386.snap --release stable
 	snapcraft push statping_${VERSION}_armhf.snap --release stable
 
-.PHONY: all build build-all build-alpine test-all test test-api docker frontend up down print_details lite sentry-release
+.PHONY: all build build-all build-alpine test-all test test-api docker frontend up down print_details lite sentry-release snapcraft build-bin build-win build-all
 .SILENT: travis_s3_creds
diff --git a/app.json b/app.json
@@ -2,6 +2,6 @@
   "name": "Statping",
   "description": "Statping Server Monitoring with Status Page",
   "repository": "https://github.com/statping/statping",
-  "logo": "https://raw.githubusercontent.com/hunterlong/statping/master/source/tmpl/banner.png",
+  "logo": "https://raw.githubusercontent.com/statping/statping/master/source/tmpl/banner.png",
   "keywords": ["statping", "server", "monitoring", "status page","golang", "go"]
 }
diff --git a/cmd/cli.go b/cmd/cli.go
@@ -349,7 +349,7 @@ func HelpEcho() {
 }
 
 func checkGithubUpdates() (githubResponse, error) {
-	url := "https://api.github.com/repos/hunterlong/statping/releases/latest"
+	url := "https://api.github.com/repos/statping/statping/releases/latest"
 	contents, _, err := utils.HttpRequest(url, "GET", nil, nil, nil, time.Duration(2*time.Second), true)
 	if err != nil {
 		return githubResponse{}, err

diff --git a/dev/Dockerfile.dev b/dev/Dockerfile.dev
@@ -7,7 +7,7 @@ RUN npm install -g yarn
 RUN curl -L -s https://assets.statping.com/sass -o /usr/local/bin/sass && \
     chmod +x /usr/local/bin/sass
 
-WORKDIR /go/src/github.com/hunterlong/statping
+WORKDIR /go/src/github.com/statping/statping
 
 ADD go.mod go.sum version.txt ./
 
@@ -22,7 +22,7 @@ ADD frontend/package.json frontend/yarn.lock ./frontend/
 RUN cd frontend && yarn install --pure-lockfile --network-timeout 1000000 && yarn cache clean
 
 ENV IS_DOCKER=true
-ENV STATPING_DIR=/go/src/github.com/hunterlong/statping
+ENV STATPING_DIR=/go/src/github.com/statping/statping
 
 EXPOSE 8585
 EXPOSE 8888

diff --git a/dev/docker-compose.full.yml b/dev/docker-compose.full.yml
@@ -21,7 +21,7 @@ services:
 #        COMMIT: DEV
 #    restart: on-failure
 #    volumes:
-#      - ./:/go/src/github.com/hunterlong/statping
+#      - ./:/go/src/github.com/statping/statping
 #    environment:
 #      VIRTUAL_HOST: local.statping.com
 #      VIRTUAL_PORT: 8888

diff --git a/dev/docker-compose.lite.yml b/dev/docker-compose.lite.yml
@@ -4,19 +4,19 @@ services:
 
   statping_dev:
     container_name: statping_dev
-    image: hunterlong/statping:dev
+    image: statping/statping:dev
     restart: on-failure
     volumes:
-      - ./cmd:/go/src/github.com/hunterlong/statping/cmd/
-      - ./core:/go/src/github.com/hunterlong/statping/core/
-      - ./database:/go/src/github.com/hunterlong/statping/database/
-      - ./dev:/go/src/github.com/hunterlong/statping/dev/
-      - ./frontend:/go/src/github.com/hunterlong/statping/frontend/
-      - ./handlers:/go/src/github.com/hunterlong/statping/handlers/
-      - ./notifiers:/go/src/github.com/hunterlong/statping/notifiers/
-      - ./source:/go/src/github.com/hunterlong/statping/source/
-      - ./types:/go/src/github.com/hunterlong/statping/types/
-      - ./utils:/go/src/github.com/hunterlong/statping/utils/
+      - ./cmd:/go/src/github.com/statping/statping/cmd/
+      - ./core:/go/src/github.com/statping/statping/core/
+      - ./database:/go/src/github.com/statping/statping/database/
+      - ./dev:/go/src/github.com/statping/statping/dev/
+      - ./frontend:/go/src/github.com/statping/statping/frontend/
+      - ./handlers:/go/src/github.com/statping/statping/handlers/
+      - ./notifiers:/go/src/github.com/statping/statping/notifiers/
+      - ./source:/go/src/github.com/statping/statping/source/
+      - ./types:/go/src/github.com/statping/statping/types/
+      - ./utils:/go/src/github.com/statping/statping/utils/
     environment:
       DB_CONN: sqlite
       API_KEY: exampleapikey

diff --git a/dev/grafana/statping_dashboard.json b/dev/grafana/statping_dashboard.json
@@ -612,5 +612,5 @@
   "title": "Statping",
   "uid": "6BzRjddmz",
   "version": 25,
-  "description": "Monitor your websites and applications using Statping service. View more information at https://github.com/hunterlong/statping"
+  "description": "Monitor your websites and applications using Statping service. View more information at https://github.com/statping/statping"
 }
diff --git a/dev/init.sh b/dev/init.sh
@@ -12,7 +12,7 @@
 cd /home/ubuntu
 source /home/ubuntu/.profile
 sudo rm -rf startup.sh > /dev/null
-sudo curl -o startup.sh -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/hunterlong/statping/master/dev/startup.sh > /dev/null
+sudo curl -o startup.sh -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/statping/statping/master/dev/startup.sh > /dev/null
 sudo chmod +x startup.sh > /dev/null
 sudo rm -f docker-compose.yml > /dev/null
 
@@ -21,7 +21,7 @@ EC_IP=$(curl -s http://169.254.169.254/latest/meta-data/public-ipv4)
 
 if [ "$LETSENCRYPT_HOST" = "" ]
 then
-   sudo curl -o docker-compose.yml -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/hunterlong/statping/master/dev/docker-compose-single.yml > /dev/null
+   sudo curl -o docker-compose.yml -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/statping/statping/master/dev/docker-compose-single.yml > /dev/null
 else
    printf "                    \n\n\n\nDomain found for SSL certificate - $LETSENCRYPT_HOST\n"
    printf "================================================================================================================\n"
@@ -33,7 +33,7 @@ else
    printf "   A      $LETSENCRYPT_HOST   =>   $EC_IP                                        (or use A record if you are using an Elastic IP)\n"
    printf "================================================================================================================\n\n\n"
 
-   sudo curl -o docker-compose.yml -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/hunterlong/statping/dev/docker-compose-ssl.yml > /dev/null
+   sudo curl -o docker-compose.yml -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/statping/statping/dev/docker-compose-ssl.yml > /dev/null
 fi
 
 sudo service docker start > /dev/null
@@ -49,7 +49,7 @@ fi
 
 sudo docker system prune -af > /dev/null
 
-sudo curl https://raw.githubusercontent.com/hunterlong/statping/dev/init.sh > /home/ubuntu/init.sh
+sudo curl https://raw.githubusercontent.com/statping/statping/dev/init.sh > /home/ubuntu/init.sh
 sudo chmod +x /home/ubuntu/init.sh > /dev/null
 
 printf "\n\n\n\n\n              Statping Status Page on EC2\n"

diff --git a/dev/install.sh b/dev/install.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 OS=osx
 ARCH=x64
-REPO=github.com/hunterlong/statping
+REPO=github.com/statping/statping
 VERSION=$(curl -s "https://$REPO/releases/latest" | grep -o 'tag/[v.0-9]*' | awk -F/ '{print $2}')
 if [ `getconf LONG_BIT` = "64" ]
 then
@@ -24,4 +24,4 @@ curl -L -sS $FILE -o statping.tar.gz && tar xzf statping.tar.gz && rm statping.t
 chmod +x statping
 echo "Installing Statping to directory: /usr/local/bin/"
 mv statping /usr/local/bin/
-echo "Statping $VERSION has been successfully installed! Try 'statping version' to check it!"
+echo "Statping $VERSION has been successfully installed! Try 'statping version' to check it!"
diff --git a/dev/postman.json b/dev/postman.json
@@ -2164,7 +2164,7 @@
 					"response": []
 				}
 			],
-			"description": "Statping contains multiple notifiers that will send you a notification whenever a service become offline, or online. You can create your own 3rd party notifier by reading more on the [Notifiers Wiki](https://github.com/hunterlong/statping/wiki/Notifiers) on the Github repo.",
+			"description": "Statping contains multiple notifiers that will send you a notification whenever a service become offline, or online. You can create your own 3rd party notifier by reading more on the [Notifiers Wiki](https://github.com/statping/statping/wiki/Notifiers) on the Github repo.",
 			"auth": {
 				"type": "bearer",
 				"bearer": [
@@ -3471,4 +3471,4 @@
 		}
 	],
 	"protocolProfileBehavior": {}
-}
+}
diff --git a/dev/services_in_text.txt b/dev/services_in_text.txt
@@ -1,13 +1,13 @@
 https://demo.statping.com/
-https://github.com/hunterlong/statping
+https://github.com/statping/statping
 https://statping.com
-https://hub.docker.com/r/hunterlong/statping/
-https://godoc.org/github.com/hunterlong/statping
-https://hub.docker.com/r/hunterlong/statping/
-https://goreportcard.com/report/github.com/hunterlong/statping
+https://hub.docker.com/r/statping/statping/
+https://godoc.org/github.com/statping/statping
+https://hub.docker.com/r/statping/statping/
+https://goreportcard.com/report/github.com/statping/statping
 http://slack.statping.com
 https://www.google.com/search?q=do+a+barrel+roll
-https://travis-ci.com/hunterlong/statping
+https://travis-ci.com/statping/statping
 https://vue.statping.com
 http://gorm.io
 https://www.youtube.com/watch?v=mLOdar3jshI

diff --git a/doc.go b/doc.go
@@ -8,7 +8,7 @@
 // the zip file from the latest releases link.
 //
 //		// MacOS using homebrew
-//		brew tap hunterlong/statping
+//		brew tap statping/statping
 //		brew install statping
 //
 //		// Linux installation
@@ -18,7 +18,7 @@
 // Docker
 //
 // Statping can be built in many way, the best way is to use Docker!
-//		docker run -it -p 8080:8080 hunterlong/statping
+//		docker run -it -p 8080:8080 statping/statping
 //
 // Enjoy Statping and tell me any issues you might be having on Github. https://github.com/hunterlong
 package statping
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
 
   statping:
     container_name: statping
-    image: hunterlong/statping:latest
+    image: statping/statping:latest
     restart: always
     volumes:
       - statping_data:/app

diff --git a/source/wiki.go b/source/wiki.go