66 Commits

Author SHA1 Message Date
Nana Janashia
e7b83ef190 add terraform remote backend 2020-12-19 15:20:15 +01:00
Nana Janashia
c9d167df44 add docker login 2020-12-19 13:18:16 +01:00
Nana Janashia
7562eb4836 add jenkins ip for port 22 2020-12-19 11:10:35 +01:00
Nana Janashia
c8b8509967 fix syntax 2020-12-19 10:59:34 +01:00
Nana Janashia
df4698ad04 add terraform config for deploying to ec2 2020-12-19 10:56:16 +01:00
Nana Janashia
6123875bc8 add changes 2020-11-22 15:03:10 +01:00
Nana Janashia
1f54931484 add changes 2020-11-22 14:46:01 +01:00
Nana Janashia
18ecdca204 fix 2020-11-22 14:35:13 +01:00
Nana Janashia
e1dbd4d042 fix 2020-11-22 14:32:48 +01:00
Nana Janashia
36b85d75cc pass image name to shell script 2020-11-22 14:30:13 +01:00
Nana Janashia
c120554c74 tag replacement in docker-compose 2020-11-22 14:19:34 +01:00
Nana Janashia
3e1d99e8d0 rm env set 2020-11-22 14:10:05 +01:00
Nana Janashia
e71aab1655 add shell script for executing 2020-11-22 14:04:09 +01:00
Nana Janashia
762a6a9ffb add shell script for executing 2020-11-22 13:59:25 +01:00
Nana Janashia
e14b7b7012 fix env var setup 2020-11-22 13:43:08 +01:00
Nana Janashia
106a7e447e fix ports 2020-11-22 13:28:47 +01:00
Nana Janashia
b28d6ff9d9 add docker-compose config 2020-11-22 13:27:04 +01:00
Nana Janashia
4e33b70b24 Delete test.sh 2020-11-22 11:48:37 +00:00
Nana Janashia
d41bcec12b Update Jenkinsfile 2020-11-22 11:46:58 +00:00
Nana Janashia
9dadc24128 Update test.sh 2020-11-22 11:46:37 +00:00
Nana Janashia
12f88937ab Update Jenkinsfile 2020-11-22 11:38:52 +00:00
Nana Janashia
8b1aa75d8e Update test.sh 2020-11-22 11:38:44 +00:00
Nana Janashia
339109ec86 Update Jenkinsfile 2020-11-22 11:14:16 +00:00
Nana Janashia
63f6c3d5bb Update Jenkinsfile 2020-11-22 11:10:37 +00:00
Nana Janashia
ba9f0882ca Update freestyle-build.sh 2020-11-22 11:00:46 +00:00
Nana Janashia
0b043899f9 Update Jenkinsfile 2020-11-22 11:00:27 +00:00
Nana Janashia
f31394abe3 Update Jenkinsfile 2020-11-22 11:00:15 +00:00
Nana Janashia
e2633b0888 Update freestyle-build.sh 2020-11-22 10:56:56 +00:00
Nana Janashia
a1b5946b6d fixed building jar file 2020-11-22 11:32:38 +01:00
Nana Janashia
45817d153a fixed port 2020-11-22 10:13:21 +01:00
Nana Janashia
0576e0033b fixed env var usage 2020-11-22 10:08:59 +01:00
Nana Janashia
44cf4ac38c adjustments 2020-11-22 09:58:37 +01:00
Nana Janashia
04f35ad918 Update Jenkinsfile 2020-11-08 15:26:35 +00:00
Nana Janashia
686259038b add shebang 2020-11-08 15:39:58 +01:00
Nana Janashia
1978bd1fc9 Update Jenkinsfile 2020-11-08 12:57:32 +00:00
Nana Janashia
b262ce98c8 Update Jenkinsfile 2020-11-08 12:56:40 +00:00
Nana Janashia
24fdad6aaa Update Jenkinsfile 2020-11-08 09:46:22 +00:00
Nana Janashia
e41eb6433d Update Jenkinsfile 2020-11-08 09:45:28 +00:00
Nana Janashia
1ce128d916 Update Jenkinsfile 2020-11-08 08:10:52 +00:00
Nana Janashia
2c6295012f Update Jenkinsfile 2020-11-08 08:10:25 +00:00
Nana Janashia
48b35c0308 Update Jenkinsfile 2020-11-08 08:09:54 +00:00
Nana Janashia
80ed88f4be Update Jenkinsfile 2020-11-08 08:09:11 +00:00
Nana Janashia
f8698fee42 Update Jenkinsfile 2020-11-07 17:43:27 +00:00
Nana Janashia
eea2109d66 Update Jenkinsfile 2020-11-07 17:43:18 +00:00
Nana Janashia
a71dd16df8 Update Jenkinsfile 2020-11-07 17:18:06 +00:00
Nana Janashia
8e3382a0ef Update Jenkinsfile 2020-11-07 17:07:02 +00:00
Nana Janashia
1d4aac4b5a Update Jenkinsfile 2020-11-07 17:04:52 +00:00
Nana Janashia
f65d9eb00e Update Jenkinsfile 2020-11-07 16:59:22 +00:00
Nana Janashia
a026af6e2f Update Jenkinsfile 2020-11-07 16:56:56 +00:00
Nana Janashia
02aef32659 Update Jenkinsfile 2020-11-07 16:53:58 +00:00
Nana Janashia
e68743b02d Update Jenkinsfile 2020-11-07 16:52:56 +00:00
Nana Janashia
ce28529588 Update Jenkinsfile 2020-11-07 16:51:48 +00:00
Nana Janashia
a0deb05e4e Update Jenkinsfile 2020-11-07 16:50:48 +00:00
Nana Janashia
126336f79e Update Jenkinsfile 2020-11-07 16:44:13 +00:00
Nana Janashia
19eeb818ca Update Jenkinsfile 2020-11-07 16:41:18 +00:00
Nana Janashia
ff51c37f0a Update Jenkinsfile 2020-11-07 16:40:39 +00:00
Nana Janashia
948fbb8f12 Update Jenkinsfile 2020-11-07 16:39:30 +00:00
Nana Janashia
679d67b80a Update Jenkinsfile 2020-11-07 16:37:49 +00:00
Nana Janashia
661a008faa Update Jenkinsfile 2020-11-07 16:36:06 +00:00
Nana Janashia
9cc6d90fe8 Update Jenkinsfile 2020-11-07 16:32:06 +00:00
Nana Janashia
61821c6ef7 Update Jenkinsfile 2020-11-06 12:47:14 +00:00
Nana Janashia
1fa470771d Delete script.groovy 2020-11-06 12:27:54 +00:00
Nana Janashia
9c56ddc553 Update Jenkinsfile 2020-11-06 12:26:25 +00:00
Nana Janashia
056eca7cf6 Update script.groovy 2020-11-06 11:26:50 +00:00
Nana Janashia
e637047b84 Update Jenkinsfile 2020-11-06 11:26:28 +00:00
Nana Janashia
845783dbc6 Update Jenkinsfile 2020-11-06 11:17:00 +00:00
12 changed files with 258 additions and 41 deletions

83
Jenkinsfile vendored
View File

@@ -1,47 +1,80 @@
def gv
#!/usr/bin/env groovy
library identifier: 'jenkins-shared-library@master', retriever: modernSCM(
[$class: 'GitSCMSource',
remote: 'https://gitlab.com/nanuchi/jenkins-shared-library.git',
credentialsId: 'gitlab-credentials'
]
)
pipeline {
agent any
parameters {
choice(name: 'VERSION', choices: ['1.1.0', '1.2.0', '1.3.0'], description: '')
booleanParam(name: 'executeTests', defaultValue: true, description: '')
tools {
maven 'Maven'
}
environment {
IMAGE_NAME = 'nanajanashia/demo-app:java-maven-2.0'
}
stages {
stage("init") {
stage('build app') {
steps {
script {
echo 'building application jar...'
buildJar()
}
}
}
stage('build image') {
steps {
script {
gv = load "script.groovy"
echo 'building docker image...'
buildImage(env.IMAGE_NAME)
dockerLogin()
dockerPush(env.IMAGE_NAME)
}
}
}
stage("build") {
stage('provision server') {
environment {
AWS_ACCESS_KEY_ID = credentials('jenkins_aws_access_key_id')
AWS_SECRET_ACCESS_KEY = credentials('jenkins_aws_secret_access_key')
TF_VAR_env_prefix = 'test'
}
steps {
script {
gv.buildApp()
dir('terraform') {
sh "terraform init"
sh "terraform apply --auto-approve"
EC2_PUBLIC_IP = sh(
script: "terraform output ec2_public_ip",
returnStdout: true
).trim()
}
}
}
}
stage("test") {
when {
expression {
params.executeTests
}
stage('deploy') {
environment {
DOCKER_CREDS = credentials('docker-hub-repo')
}
steps {
script {
gv.testApp()
}
}
}
stage("deploy") {
steps {
script {
env.ENV = input message: "Select the environment to deploy to", ok: "Done", parameters: [choice(name: 'ONE', choices: ['dev', 'staging', 'prod'], description: '')]
echo "waiting for EC2 server to initialize"
sleep(time: 90, unit: "SECONDS")
gv.deployApp()
echo "Deploying to ${ENV}"
echo 'deploying docker image to EC2...'
echo "${EC2_PUBLIC_IP}"
def shellCmd = "bash ./server-cmds.sh ${IMAGE_NAME} ${DOCKER_CREDS_USR} ${DOCKER_CREDS_PSW}"
def ec2Instance = "ec2-user@${EC2_PUBLIC_IP}"
sshagent(['server-ssh-key']) {
sh "scp -o StrictHostKeyChecking=no server-cmds.sh ${ec2Instance}:/home/ec2-user"
sh "scp -o StrictHostKeyChecking=no docker-compose.yaml ${ec2Instance}:/home/ec2-user"
sh "ssh -o StrictHostKeyChecking=no ${ec2Instance} ${shellCmd}"
}
}
}
}
}
}
}
}

12
docker-compose.yaml Normal file
View File

@@ -0,0 +1,12 @@
version: '3.8'
services:
java-maven-app:
image: ${IMAGE}
ports:
- 8080:8080
postgres:
image: postgres:13
ports:
- 5432:5432
environment:
- POSTGRES_PASSWORD=my-pwd

View File

@@ -1,2 +0,0 @@
# npm --version
# docker --version

17
pom.xml
View File

@@ -8,6 +8,23 @@
<artifactId>java-maven-app</artifactId>
<version>1.0-SNAPSHOT</version>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.3.5.RELEASE</version>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>

View File

@@ -1,14 +0,0 @@
def buildApp() {
echo 'building the application...'
}
def testApp() {
echo 'testing the application...'
}
def deployApp() {
echo 'deplying the application...'
echo "deploying version ${params.VERSION}"
}
return this

8
server-cmds.sh Normal file
View File

@@ -0,0 +1,8 @@
#!/usr/bin/env bash
export IMAGE=$1
export DOCKER_USER=$2
export DOCKER_PWD=$3
echo $DOCKER_PWD | docker login -u $DOCKER_USER --password-stdin
docker-compose -f docker-compose.yaml up --detach
echo "success"

19
terraform/.terraform.lock.hcl generated Executable file
View File

@@ -0,0 +1,19 @@
# This file is maintained automatically by "terraform init".
# Manual edits may be lost in future updates.
provider "registry.terraform.io/hashicorp/aws" {
version = "3.22.0"
hashes = [
"h1:f/Tz8zv1Zb78ZaiyJkQ0MGIViZwbYrLuQk3kojPM91c=",
"zh:4a9a66caf1964cdd3b61fb3ebb0da417195a5529cb8e496f266b0778335d11c8",
"zh:514f2f006ae68db715d86781673faf9483292deab235c7402ff306e0e92ea11a",
"zh:5277b61109fddb9011728f6650ef01a639a0590aeffe34ed7de7ba10d0c31803",
"zh:67784dc8c8375ab37103eea1258c3334ee92be6de033c2b37e3a2a65d0005142",
"zh:76d4c8be2ca4a3294fb51fb58de1fe03361d3bc403820270cc8e71a04c5fa806",
"zh:8f90b1cfdcf6e8fb1a9d0382ecaa5056a3a84c94e313fbf9e92c89de271cdede",
"zh:d0ac346519d0df124df89be2d803eb53f373434890f6ee3fb37112802f9eac59",
"zh:d6256feedada82cbfb3b1dd6dd9ad02048f23120ab50e6146a541cb11a108cc1",
"zh:db2fe0d2e77c02e9a74e1ed694aa352295a50283f9a1cf896e5be252af14e9f4",
"zh:eda61e889b579bd90046939a5b40cf5dc9031fb5a819fc3e4667a78bd432bdb2",
]
}

View File

@@ -0,0 +1,8 @@
#!/bin/bash
sudo yum update -y && sudo yum install -y docker
sudo systemctl start docker
sudo usermod -aG docker ec2-user
# install docker-compose
sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose

112
terraform/main.tf Normal file
View File

@@ -0,0 +1,112 @@
terraform {
required_version = ">= 0.12"
backend "s3" {
bucket = "myapp-bucket"
key = "myapp/state.tfstate"
region = "eu-west-3"
}
}
provider "aws" {
region = var.region
}
resource "aws_vpc" "myapp-vpc" {
cidr_block = var.vpc_cidr_block
tags = {
Name: "${var.env_prefix}-vpc"
}
}
resource "aws_subnet" "myapp-subnet-1" {
vpc_id = aws_vpc.myapp-vpc.id
cidr_block = var.subnet_cidr_block
availability_zone = var.avail_zone
tags = {
Name: "${var.env_prefix}-subnet-1"
}
}
resource "aws_internet_gateway" "myapp-igw" {
vpc_id = aws_vpc.myapp-vpc.id
tags = {
Name: "${var.env_prefix}-igw"
}
}
resource "aws_default_route_table" "main-rtb" {
default_route_table_id = aws_vpc.myapp-vpc.default_route_table_id
route {
cidr_block = "0.0.0.0/0"
gateway_id = aws_internet_gateway.myapp-igw.id
}
tags = {
Name: "${var.env_prefix}-main-rtb"
}
}
resource "aws_default_security_group" "default-sg" {
vpc_id = aws_vpc.myapp-vpc.id
ingress {
from_port = 22
to_port = 22
protocol = "tcp"
cidr_blocks = [var.my_ip, var.jenkins_ip]
}
ingress {
from_port = 8080
to_port = 8080
protocol = "tcp"
cidr_blocks = ["0.0.0.0/0"]
}
egress {
from_port = 0
to_port = 0
protocol = "-1"
cidr_blocks = ["0.0.0.0/0"]
prefix_list_ids = []
}
tags = {
Name: "${var.env_prefix}-default-sg"
}
}
data "aws_ami" "latest-amazon-linux-image" {
most_recent = true
owners = ["amazon"]
filter {
name = "name"
values = ["amzn2-ami-hvm-*-x86_64-gp2"]
}
filter {
name = "virtualization-type"
values = ["hvm"]
}
}
resource "aws_instance" "myapp-server" {
ami = data.aws_ami.latest-amazon-linux-image.id
instance_type = var.instance_type
subnet_id = aws_subnet.myapp-subnet-1.id
vpc_security_group_ids = [aws_default_security_group.default-sg.id]
availability_zone = var.avail_zone
associate_public_ip_address = true
key_name = "myapp-key-pair"
user_data = file("entry-script.sh")
tags = {
Name = "${var.env_prefix}-server"
}
}
output "ec2_public_ip" {
value = aws_instance.myapp-server.public_ip
}

24
terraform/variables.tf Normal file
View File

@@ -0,0 +1,24 @@
variable vpc_cidr_block {
default = "10.0.0.0/16"
}
variable subnet_cidr_block {
default = "10.0.10.0/24"
}
variable avail_zone {
default = "eu-west-3a"
}
variable env_prefix {
default = "dev"
}
variable my_ip {
default = "212.124.154.110/32"
}
variable jenkins_ip {
default = "139.59.140.177/32"
}
variable instance_type {
default = "t2.micro"
}
variable region {
default = "eu-west-3"
}