From e61b2fd25d82a49a4a380ac87e294b1769a6517c Mon Sep 17 00:00:00 2001 From: Aryom Belousov Date: Mon, 9 Nov 2020 15:25:07 +0300 Subject: [PATCH] Removed obsolete configs --- Dockerfile | 7 +++++-- Jenkinsfile | 15 -------------- ansible/playbook.yml | 49 -------------------------------------------- deploy.sh | 30 --------------------------- jenkins/Dockerfile | 20 ------------------ jenkins/run.sh | 18 ---------------- run.sh | 10 --------- 7 files changed, 5 insertions(+), 144 deletions(-) delete mode 100644 Jenkinsfile delete mode 100644 ansible/playbook.yml delete mode 100755 deploy.sh delete mode 100644 jenkins/Dockerfile delete mode 100755 jenkins/run.sh delete mode 100755 run.sh diff --git a/Dockerfile b/Dockerfile index 601b0b0..abdb52c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,9 @@ -FROM golang:latest +FROM golang:1.15.4-alpine3.12 COPY . /go/src/go-mtg-vk WORKDIR /go/src/go-mtg-vk RUN mkdir logs -ENTRYPOINT ./run.sh \ No newline at end of file +RUN go install +WORKDIR /go/bin +ENV GIN_MODE=release +ENTRYPOINT ./go-mtg-vk diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index b50bf08..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,15 +0,0 @@ -pipeline { - agent any - stages { - stage('Test') { - steps { - sh './deploy.sh test' - } - } - stage('Deploy') { - steps { - sh './deploy.sh prod' - } - } - } -} diff --git a/ansible/playbook.yml b/ansible/playbook.yml deleted file mode 100644 index fd1f54c..0000000 --- a/ansible/playbook.yml +++ /dev/null @@ -1,49 +0,0 @@ -- hosts: server - remote_user: root - vars_prompt: - - name: vk_token - private: no - prompt: "Enter vk token" - - name: vk_secret_key - private: no - prompt: "Enter vk secret key" - - name: vk_group_id - private: no - prompt: "Enter vk group id" - - name: vk_confirmation_string - private: no - prompt: "Enter vk confirmation string" - tasks: - - name: Install git - apt: - name: git - - name: Install docker - snap: - name: docker - - name: Pull repository - git: - dest: ~/go-mtg-vk - repo: https://github.com/Flygrounder/go-mtg-vk.git - - name: Append vk_token to .bashrc - lineinfile: - line: "export VK_TOKEN=\"{{vk_token}}\"" - path: ~/.bashrc - - name: Append vk_secret_key to .bashrc - lineinfile: - line: "export VK_SECRET_KEY=\"{{vk_secret_key}}\"" - path: ~/.bashrc - - name: Append vk_group_id to .bashrc - lineinfile: - line: "export VK_GROUP_ID=\"{{vk_group_id}}\"" - path: ~/.bashrc - - name: Append vk_confirmation_string to .bashrc - lineinfile: - line: "export VK_CONFIRMATION_STRING=\"{{vk_confirmation_string}}\"" - path: ~/.bashrc - - name: Run jenkins - command: bash ~/go-mtg-vk/jenkins/run.sh - environment: - VK_TOKEN: "{{vk_token}}" - VK_SECRET_KEY: "{{vk_secret_key}}" - VK_GROUP_ID: "{{vk_group_id}}" - VK_CONFIRMATION_STRING: "{{vk_confirmation_string}}" diff --git a/deploy.sh b/deploy.sh deleted file mode 100755 index 7e3b963..0000000 --- a/deploy.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -TEST_IMAGE_NAME="go_mtg_vk_test_image" -PROD_IMAGE_NAME="go_mtg_vk_prod_image" -if [[ $1 = "test" ]] -then - TEST_NETWORK_NAME="go_mtg_vk_test_network" - sudo docker network create $TEST_NETWORK_NAME - TEST_REDIS_NAME="go_mtg_vk_test_redis" - sudo docker run -d --rm --name $TEST_REDIS_NAME --network $TEST_NETWORK_NAME --net-alias redis redis - sudo docker rmi -f $TEST_IMAGE_NAME - sudo docker build -t $TEST_IMAGE_NAME . - TEST_CONTAINER_NAME="go_mtg_vk_test_container" - sudo docker run --rm --name $TEST_CONTAINER_NAME --network $TEST_NETWORK_NAME -e MODE="test" -e VK_TOKEN="$VK_TOKEN" -e VK_SECRET_KEY="$VK_SECRET_KEY" -e VK_GROUP_ID="$VK_GROUP_ID" -e VK_CONFIRMATION_STRING="$VK_CONFIRMATION_STRING" $TEST_IMAGE_NAME - EXIT_CODE=$(sudo docker inspect $TEST_CONTAINER_NAME --format "{{.State.ExitCode}}") - sudo docker rm -f $TEST_REDIS_NAME - exit $(("$EXIT_CODE")) -elif [[ $1 = "prod" ]] -then - PROD_NETWORK_NAME="go_mtg_vk_prod_network" - sudo docker network create $PROD_NETWORK_NAME - PROD_REDIS_NAME="go_mtg_vk_prod_redis" - sudo docker run -d --net-alias redis --restart always --network $PROD_NETWORK_NAME --name $PROD_REDIS_NAME redis - sudo docker rmi -f $PROD_IMAGE_NAME - sudo docker tag $TEST_IMAGE_NAME $PROD_IMAGE_NAME - sudo docker rmi $TEST_IMAGE_NAME - PROD_CONTAINER_NAME="go_mtg_vk_prod_container" - sudo docker stop $PROD_CONTAINER_NAME - sudo docker rm $PROD_CONTAINER_NAME - sudo docker run -v /var/log/go_mtg_vk:/go/src/go-mtg-vk/logs -d -p 8888:80 --network $PROD_NETWORK_NAME --restart always --name $PROD_CONTAINER_NAME -e MODE="prod" -e VK_TOKEN="$VK_TOKEN" -e VK_SECRET_KEY="$VK_SECRET_KEY" -e VK_GROUP_ID="$VK_GROUP_ID" -e VK_CONFIRMATION_STRING="$VK_CONFIRMATION_STRING" $PROD_IMAGE_NAME -fi diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile deleted file mode 100644 index 19f39a5..0000000 --- a/jenkins/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM jenkins/jenkins:latest -USER root -RUN apt update -RUN apt install -y sudo -RUN echo "jenkins ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers -USER jenkins -RUN sudo apt update -RUN sudo apt install -y \ - apt-transport-https \ - ca-certificates \ - curl \ - gnupg-agent \ - software-properties-common -RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - -RUN sudo add-apt-repository \ - "deb [arch=amd64] https://download.docker.com/linux/debian \ - $(lsb_release -cs) \ - stable" -RUN sudo apt update -RUN sudo apt install -y docker-ce docker-ce-cli containerd.io diff --git a/jenkins/run.sh b/jenkins/run.sh deleted file mode 100755 index dd7ecac..0000000 --- a/jenkins/run.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -IMAGE_NAME="mtg_vk_go_jenkins_image" -CONTAINER_NAME="mtg_vk_go_jenkins_container" -sudo docker build -t $IMAGE_NAME . -sudo docker run -d \ - --restart always\ - -p 8081:8080\ - --privileged\ - -v /var/run/docker.sock:/var/run/docker.sock\ - -v jenkins_home_mtg_go:/var/jenkins_home\ - --name $CONTAINER_NAME\ - -e VK_TOKEN="$VK_TOKEN"\ - -e VK_SECRET_KEY="$VK_SECRET_KEY"\ - -e VK_GROUP_ID="$VK_GROUP_ID"\ - -e VK_CONFIRMATION_STRING="$VK_CONFIRMATION_STRING"\ - --name $CONTAINER_NAME\ - $IMAGE_NAME -sudo docker exec -it $CONTAINER_NAME sudo service docker start diff --git a/run.sh b/run.sh deleted file mode 100755 index 3059117..0000000 --- a/run.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -if [[ $MODE = "test" ]] -then - go test ./... -elif [[ $MODE = "prod" ]] -then - go build . - export GIN_MODE="release" - ./go-mtg-vk -fi