From 87c44e39573692347d4d7eb0623d20e06cf8ed7d Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Thu, 8 Dec 2016 12:03:40 +0800 Subject: [PATCH] remove docker folder. Signed-off-by: Bo-Yi Wu --- .drone.yml.sig | 2 +- docker/Dockerfile.build | 12 ------------ docker/Dockerfile.dist | 9 --------- docker/docker-compose.testing.yml | 21 --------------------- docker/golang/Dockerfile | 9 --------- docker/redis/Dockerfile | 7 ------- docker/testing.sh | 13 ------------- 7 files changed, 1 insertion(+), 72 deletions(-) delete mode 100644 docker/Dockerfile.build delete mode 100644 docker/Dockerfile.dist delete mode 100644 docker/docker-compose.testing.yml delete mode 100644 docker/golang/Dockerfile delete mode 100644 docker/redis/Dockerfile delete mode 100755 docker/testing.sh diff --git a/.drone.yml.sig b/.drone.yml.sig index 9a631ff..1d27980 100644 --- a/.drone.yml.sig +++ b/.drone.yml.sig @@ -1 +1 @@ -eyJhbGciOiJIUzI1NiJ9.d29ya3NwYWNlOgogIHBhdGg6IC9nby9zcmMvZ2l0aHViLmNvbS9hcHBsZWJveS9nb3J1c2gKCnBpcGVsaW5lOgogICMgcmVzdG9yZSB0aGUgY2FjaGUgZnJvbSBhbiBzZnRwIHNlcnZlcgogIHJlc3RvcmVfY2FjaGU6CiAgICBpbWFnZTogYXBwbGVib3kvZHJvbmUtc2Z0cC1jYWNoZQogICAgcmVzdG9yZTogdHJ1ZQogICAgbW91bnQ6IFsgLmdsaWRlLCB2ZW5kb3IgXQogICAgaWdub3JlX2JyYW5jaDogdHJ1ZQoKICBidWlsZDoKICAgIGltYWdlOiBhcHBsZWJveS9nb2xhbmctdGVzdGluZzoke0dPX1ZFUlNJT059CiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBHT1BBVEg9L2dvCiAgICBjb21tYW5kczoKICAgICAgLSBtYWtlIGRlcF9pbnN0YWxsCiAgICAgIC0gbWFrZSB2ZXQKICAgICAgLSBtYWtlIGxpbnQKICAgICAgLSBtYWtlIGJ1aWxkCiAgICAgIC0gY292ZXJhZ2UgYWxsCiAgICAgICMgc2VuZCBjb3ZlcmFnZSByZXBvcnQKICAgICAgLSBjdXJsIC1zIGh0dHBzOi8vY29kZWNvdi5pby9iYXNoID4gLmNvZGVjb3YgJiYKICAgICAgICBjaG1vZCAreCAuY29kZWNvdiAmJgogICAgICAgIC4vLmNvZGVjb3YgLXQgJHtDT0RFQ09WX1RPS0VOfSAtZiAuY292ZXIvY292ZXJhZ2UudHh0CiAgICAgICMgYnVpbGQgYmluYXJ5IGZvciBkb2NrZXIgaW1hZ2UKICAgICAgLSBtYWtlIGRvY2tlcl9iaW5hcnlfYnVpbGQKCiAgcmVsZWFzZToKICAgIGltYWdlOiBhcHBsZWJveS9nb2xhbmctdGVzdGluZzoke0dPX1ZFUlNJT059CiAgICBwdWxsOiB0cnVlCiAgICBlbnZpcm9ubWVudDoKICAgICAgVEFHUzogbmV0Z28KICAgIGNvbW1hbmRzOgogICAgICAtIG1ha2UgcmVsZWFzZQogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgdGFnIF0KICAgICAgYnJhbmNoOiBbIHJlZnMvdGFncy8qIF0KICAgICAgbWF0cml4OgogICAgICAgIEdPX1ZFUlNJT046IDEuNy40CgogIGRvY2tlcjoKICAgIGltYWdlOiBwbHVnaW5zL2RvY2tlcgogICAgcmVwbzogYXBwbGVib3kvZ29ydXNoCiAgICB0YWdzOiBbICcke0RST05FX1RBR30nIF0KICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHRhZyBdCiAgICAgIGJyYW5jaDogWyByZWZzL3RhZ3MvKiBdCgogIGRvY2tlcjoKICAgIGltYWdlOiBwbHVnaW5zL2RvY2tlcgogICAgcmVwbzogYXBwbGVib3kvZ29ydXNoCiAgICB0YWdzOiBbICdsYXRlc3QnIF0KICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2ggXQogICAgICBicmFuY2g6IFsgbWFzdGVyIF0KCiAgZmFjZWJvb2s6CiAgICBpbWFnZTogYXBwbGVib3kvZHJvbmUtZmFjZWJvb2sKICAgIHB1bGw6IHRydWUKICAgIHRvOiAxMjM0OTczMzg2NTI0NjEwCiAgICB3aGVuOgogICAgICBzdGF0dXM6IFsgc3VjY2VzcywgZmFpbHVyZSBdCiAgICAgIG1hdHJpeDoKICAgICAgICBHT19WRVJTSU9OOiAxLjcuNAoKICBnaXRodWI6CiAgICBpbWFnZTogcGx1Z2lucy9naXRodWItcmVsZWFzZQogICAgZmlsZXM6CiAgICAgIC0gZGlzdC9yZWxlYXNlLyoKICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHRhZyBdCiAgICAgIGJyYW5jaDogWyByZWZzL3RhZ3MvKiBdCiAgICAgIG1hdHJpeDoKICAgICAgICBHT19WRVJTSU9OOiAxLjcuNAoKICAjIHJlYnVpbGQgdGhlIGNhY2hlIG9uIHRoZSBzZnRwIHNlcnZlcgogIHJlYnVpbGRfY2FjaGU6CiAgICBpbWFnZTogYXBwbGVib3kvZHJvbmUtc2Z0cC1jYWNoZQogICAgcmVidWlsZDogdHJ1ZQogICAgbW91bnQ6IFsgLmdsaWRlLCB2ZW5kb3IgXQogICAgaWdub3JlX2JyYW5jaDogdHJ1ZQogICAgd2hlbjoKICAgICAgYnJhbmNoOiBtYXN0ZXIKICAgICAgbWF0cml4OgogICAgICAgIEdPX1ZFUlNJT046IDEuNy40CgpzZXJ2aWNlczoKICByZWRpczoKICAgIGltYWdlOiByZWRpczphbHBpbmUKCm1hdHJpeDoKICBHT19WRVJTSU9OOgogICAgLSAxLjcuNAogICAgLSAxLjYuNAo.co6NQ83BJtDuBTkKasO6UnMpU25fC5f76HewoQebiws \ No newline at end of file +eyJhbGciOiJIUzI1NiJ9.d29ya3NwYWNlOgogIHBhdGg6IC9nby9zcmMvZ2l0aHViLmNvbS9hcHBsZWJveS9nb3J1c2gKCnBpcGVsaW5lOgogICMgcmVzdG9yZSB0aGUgY2FjaGUgZnJvbSBhbiBzZnRwIHNlcnZlcgogIHJlc3RvcmVfY2FjaGU6CiAgICBpbWFnZTogYXBwbGVib3kvZHJvbmUtc2Z0cC1jYWNoZQogICAgcmVzdG9yZTogdHJ1ZQogICAgbW91bnQ6IFsgLmdsaWRlLCB2ZW5kb3IgXQogICAgaWdub3JlX2JyYW5jaDogdHJ1ZQoKICBidWlsZDoKICAgIGltYWdlOiBhcHBsZWJveS9nb2xhbmctdGVzdGluZzoke0dPX1ZFUlNJT059CiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBHT1BBVEg9L2dvCiAgICBjb21tYW5kczoKICAgICAgLSBtYWtlIGRlcF9pbnN0YWxsCiAgICAgIC0gbWFrZSB2ZXQKICAgICAgLSBtYWtlIGxpbnQKICAgICAgLSBtYWtlIGJ1aWxkCiAgICAgIC0gY292ZXJhZ2UgYWxsCiAgICAgICMgc2VuZCBjb3ZlcmFnZSByZXBvcnQKICAgICAgLSBjdXJsIC1zIGh0dHBzOi8vY29kZWNvdi5pby9iYXNoID4gLmNvZGVjb3YgJiYKICAgICAgICBjaG1vZCAreCAuY29kZWNvdiAmJgogICAgICAgIC4vLmNvZGVjb3YgLXQgJHtDT0RFQ09WX1RPS0VOfSAtZiAuY292ZXIvY292ZXJhZ2UudHh0CiAgICAgICMgYnVpbGQgYmluYXJ5IGZvciBkb2NrZXIgaW1hZ2UKICAgICAgLSBtYWtlIGRvY2tlcl9idWlsZAoKICByZWxlYXNlOgogICAgaW1hZ2U6IGFwcGxlYm95L2dvbGFuZy10ZXN0aW5nOiR7R09fVkVSU0lPTn0KICAgIHB1bGw6IHRydWUKICAgIGVudmlyb25tZW50OgogICAgICBUQUdTOiBuZXRnbwogICAgY29tbWFuZHM6CiAgICAgIC0gbWFrZSByZWxlYXNlCiAgICB3aGVuOgogICAgICBldmVudDogWyB0YWcgXQogICAgICBicmFuY2g6IFsgcmVmcy90YWdzLyogXQogICAgICBtYXRyaXg6CiAgICAgICAgR09fVkVSU0lPTjogMS43LjQKCiAgZG9ja2VyOgogICAgaW1hZ2U6IHBsdWdpbnMvZG9ja2VyCiAgICByZXBvOiBhcHBsZWJveS9nb3J1c2gKICAgIHRhZ3M6IFsgJyR7RFJPTkVfVEFHfScgXQogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgdGFnIF0KICAgICAgYnJhbmNoOiBbIHJlZnMvdGFncy8qIF0KCiAgZG9ja2VyOgogICAgaW1hZ2U6IHBsdWdpbnMvZG9ja2VyCiAgICByZXBvOiBhcHBsZWJveS9nb3J1c2gKICAgIHRhZ3M6IFsgJ2xhdGVzdCcgXQogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCBdCiAgICAgIGJyYW5jaDogWyBtYXN0ZXIgXQoKICBmYWNlYm9vazoKICAgIGltYWdlOiBhcHBsZWJveS9kcm9uZS1mYWNlYm9vawogICAgcHVsbDogdHJ1ZQogICAgdG86IDEyMzQ5NzMzODY1MjQ2MTAKICAgIHdoZW46CiAgICAgIHN0YXR1czogWyBzdWNjZXNzLCBmYWlsdXJlIF0KICAgICAgbWF0cml4OgogICAgICAgIEdPX1ZFUlNJT046IDEuNy40CgogIGdpdGh1YjoKICAgIGltYWdlOiBwbHVnaW5zL2dpdGh1Yi1yZWxlYXNlCiAgICBmaWxlczoKICAgICAgLSBkaXN0L3JlbGVhc2UvKgogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgdGFnIF0KICAgICAgYnJhbmNoOiBbIHJlZnMvdGFncy8qIF0KICAgICAgbWF0cml4OgogICAgICAgIEdPX1ZFUlNJT046IDEuNy40CgogICMgcmVidWlsZCB0aGUgY2FjaGUgb24gdGhlIHNmdHAgc2VydmVyCiAgcmVidWlsZF9jYWNoZToKICAgIGltYWdlOiBhcHBsZWJveS9kcm9uZS1zZnRwLWNhY2hlCiAgICByZWJ1aWxkOiB0cnVlCiAgICBtb3VudDogWyAuZ2xpZGUsIHZlbmRvciBdCiAgICBpZ25vcmVfYnJhbmNoOiB0cnVlCiAgICB3aGVuOgogICAgICBicmFuY2g6IG1hc3RlcgogICAgICBtYXRyaXg6CiAgICAgICAgR09fVkVSU0lPTjogMS43LjQKCnNlcnZpY2VzOgogIHJlZGlzOgogICAgaW1hZ2U6IHJlZGlzOmFscGluZQoKbWF0cml4OgogIEdPX1ZFUlNJT046CiAgICAtIDEuNy40CiAgICAtIDEuNi40Cg.3GwnQJc2ImISxiNwGx1S5AqqsufyJuCLXKOIIxfchn8 \ No newline at end of file diff --git a/docker/Dockerfile.build b/docker/Dockerfile.build deleted file mode 100644 index 7f16ddd..0000000 --- a/docker/Dockerfile.build +++ /dev/null @@ -1,12 +0,0 @@ -FROM appleboy/golang-testing - -MAINTAINER Bo-Yi Wu - -ENV VERSION #VERSION# -RUN mkdir -p $GOPATH/src/github.com/appleboy/gorush -Add build.tar.gz $GOPATH/src/github.com/appleboy/gorush/ -WORKDIR $GOPATH/src/github.com/appleboy/gorush -RUN make dep_install -RUN CGO_ENABLED=0 make build - -CMD tar -C bin -czf - gorush diff --git a/docker/Dockerfile.dist b/docker/Dockerfile.dist deleted file mode 100644 index 47462d5..0000000 --- a/docker/Dockerfile.dist +++ /dev/null @@ -1,9 +0,0 @@ -FROM centurylink/ca-certs -EXPOSE 8088 - -ADD config/config.yml / - -ADD gorush.tar.gz / - -ENTRYPOINT ["/gorush"] -CMD ["-c", "config.yml"] diff --git a/docker/docker-compose.testing.yml b/docker/docker-compose.testing.yml deleted file mode 100644 index 7ce222a..0000000 --- a/docker/docker-compose.testing.yml +++ /dev/null @@ -1,21 +0,0 @@ -version: "2" - -services: - gorush: - build: - context: ./golang - args: - PROJECT_PATH: $PROJECT_PATH - links: - - redis - privileged: true - environment: - - ANDROID_API_KEY - - ANDROID_TEST_TOKEN - volumes: - - ../:$PROJECT_PATH - command: /bin/sh -c './docker/testing.sh' - - redis: - build: ./redis - privileged: true diff --git a/docker/golang/Dockerfile b/docker/golang/Dockerfile deleted file mode 100644 index 71fe994..0000000 --- a/docker/golang/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM appleboy/golang-testing - -MAINTAINER Bo-Yi Wu - -ARG PROJECT_PATH - -ENV PROJECT_PATH=$PROJECT_PATH - -WORKDIR $PROJECT_PATH diff --git a/docker/redis/Dockerfile b/docker/redis/Dockerfile deleted file mode 100644 index 1192e28..0000000 --- a/docker/redis/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM redis:alpine - -MAINTAINER Bo-Yi Wu - -CMD [ "redis-server" ] - -EXPOSE 6379 diff --git a/docker/testing.sh b/docker/testing.sh deleted file mode 100755 index 852b807..0000000 --- a/docker/testing.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# - -set -e - -sed -i"" -e "s/localhost/redis/g" config/config.yml -sed -i"" -e "s/localhost/redis/g" config/config.go -sed -i"" -e "s/localhost/redis/g" config/config_test.go -sed -i"" -e "s/localhost/redis/g" gorush/status_test.go -sed -i"" -e "s/localhost/redis/g" storage/redis/redis_test.go - -echo "install package and testing code coverage." -make dep_install && coverage all