22 Commits

Author SHA1 Message Date
Nana Janashia
0023bf9bde Add simple UI code 2021-07-12 12:29:54 +02:00
Nana Janashia
b52b845526 fix 2020-12-05 16:07:04 +01:00
Nana Janashia
3559bee477 add ecr push 2020-12-05 16:06:13 +01:00
Nana Janashia
86b41c173d set git configs 2020-12-05 15:37:15 +01:00
Jenkins
ec07045f5b ci: version bump 2020-12-05 14:30:58 +00:00
Nana Janashia
a9ad429d59 set global config 2020-12-05 15:25:21 +01:00
Nana Janashia
69c20e807e set 1 replica 2020-12-05 15:18:49 +01:00
Nana Janashia
1c35a7f6c3 fix cred name 2020-12-05 15:08:13 +01:00
Nana Janashia
c22ccead98 add kubectl deploy stage 2020-12-05 10:12:03 +01:00
jenkins
d2bb88b269 ci: version bump 2020-11-29 08:01:53 +00:00
Nana Janashia
14af7f6928 removed target folder from repo and ignored 2020-11-29 09:00:54 +01:00
jenkins
0f16440c51 ci: version bump 2020-11-29 07:50:50 +00:00
jenkins
9e0883d626 ci: version bump 2020-11-29 07:50:06 +00:00
Nana Janashia
ad517593dd cleanup git push from Jenkinn 2020-11-29 08:49:01 +01:00
jenkins
96a0f80bec ci: version bump 2020-11-29 07:31:41 +00:00
Nana Janashia
0972181e49 add git push from Jenkins 2020-11-29 08:30:24 +01:00
Nana Janashia
a24c7c6f15 revert jenkins git commit 2020-11-28 19:18:40 +01:00
Nana Janashia
0907a4a9f6 fix next incr version 2020-11-28 15:03:50 +01:00
Nana Janashia
7e3d309037 fix next incr version 2020-11-28 15:02:21 +01:00
Nana Janashia
f83a7744b9 fix env var 2020-11-28 14:57:13 +01:00
Nana Janashia
d8a20f2ac9 Configure version increment in build 2020-11-28 14:51:17 +01:00
Nana Janashia
ab509b3b3c add patch version to maven version 2020-11-28 11:19:23 +01:00
23 changed files with 129 additions and 277 deletions

1
.gitignore vendored
View File

@@ -1 +1,2 @@
.idea/* .idea/*
target

View File

@@ -2,7 +2,7 @@ FROM openjdk:8-jre-alpine
EXPOSE 8080 EXPOSE 8080
COPY ./target/java-maven-app-1.0-SNAPSHOT.jar /usr/app/ COPY ./target/java-maven-app-*.jar /usr/app/
WORKDIR /usr/app WORKDIR /usr/app
ENTRYPOINT ["java", "-jar", "java-maven-app-1.0-SNAPSHOT.jar"] CMD java -jar java-maven-app-*.jar

90
Jenkinsfile vendored
View File

@@ -1,78 +1,74 @@
#!/usr/bin/env groovy #!/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 { pipeline {
agent any agent any
tools { tools {
maven 'Maven' maven 'Maven'
} }
environment { environment {
IMAGE_NAME = 'nanajanashia/demo-app:java-maven-2.0' ECR_REPO_URL = '664574038682.dkr.ecr.eu-west-3.amazonaws.com'
IMAGE_REPO = "${ECR_REPO_URL}/java-maven-app"
} }
stages { stages {
stage('increment version') {
steps {
script {
echo 'incrementing app version...'
sh 'mvn build-helper:parse-version versions:set \
-DnewVersion=\\\${parsedVersion.majorVersion}.\\\${parsedVersion.minorVersion}.\\\${parsedVersion.nextIncrementalVersion} \
versions:commit'
def matcher = readFile('pom.xml') =~ '<version>(.+)</version>'
def version = matcher[0][1]
env.IMAGE_NAME = "$version-$BUILD_NUMBER"
echo "############ ${IMAGE_REPO}"
}
}
}
stage('build app') { stage('build app') {
steps { steps {
script { script {
echo 'building application jar...' echo "building the application..."
buildJar() sh 'mvn clean package'
} }
} }
} }
stage('build image') { stage('build image') {
steps { steps {
script { script {
echo 'building docker image...' echo "building the docker image..."
buildImage(env.IMAGE_NAME) withCredentials([usernamePassword(credentialsId: 'ecr-credentials', passwordVariable: 'PASS', usernameVariable: 'USER')]) {
dockerLogin() sh "docker build -t ${IMAGE_REPO}:${IMAGE_NAME} ."
dockerPush(env.IMAGE_NAME) sh "echo $PASS | docker login -u $USER --password-stdin ${ECR_REPO_URL}"
} sh "docker push ${IMAGE_REPO}:${IMAGE_NAME}"
}
}
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 {
dir('terraform') {
sh "terraform init"
sh "terraform apply --auto-approve"
EC2_PUBLIC_IP = sh(
script: "terraform output ec2_public_ip",
returnStdout: true
).trim()
} }
} }
} }
} }
stage('deploy') { stage('deploy') {
environment { environment {
DOCKER_CREDS = credentials('docker-hub-repo') AWS_ACCESS_KEY_ID = credentials('jenkins_aws_access_key_id')
AWS_SECRET_ACCESS_KEY = credentials('jenkins_aws_secret_access_key')
APP_NAME = 'java-maven-app'
} }
steps { steps {
script { script {
echo "waiting for EC2 server to initialize" echo 'deploying docker image...'
sleep(time: 90, unit: "SECONDS") sh 'envsubst < kubernetes/deployment.yaml | kubectl apply -f -'
sh 'envsubst < kubernetes/service.yaml | kubectl apply -f -'
echo 'deploying docker image to EC2...' }
echo "${EC2_PUBLIC_IP}" }
}
def shellCmd = "bash ./server-cmds.sh ${IMAGE_NAME} ${DOCKER_CREDS_USR} ${DOCKER_CREDS_PSW}" stage('commit version update') {
def ec2Instance = "ec2-user@${EC2_PUBLIC_IP}" steps {
script {
sshagent(['server-ssh-key']) { withCredentials([usernamePassword(credentialsId: 'gitlab-credentials', passwordVariable: 'PASS', usernameVariable: 'USER')]) {
sh "scp -o StrictHostKeyChecking=no server-cmds.sh ${ec2Instance}:/home/ec2-user" sh 'git config user.email "jenkins@example.com"'
sh "scp -o StrictHostKeyChecking=no docker-compose.yaml ${ec2Instance}:/home/ec2-user" sh 'git config user.name "Jenkins"'
sh "ssh -o StrictHostKeyChecking=no ${ec2Instance} ${shellCmd}" sh "git remote set-url origin https://${USER}:${PASS}@gitlab.com/nanuchi/java-maven-app.git"
} sh 'git add .'
sh 'git commit -m "ci: version bump"'
sh 'git push origin HEAD:jenkins-jobs'
}
} }
} }
} }

View File

@@ -1,12 +0,0 @@
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

@@ -0,0 +1,24 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: $APP_NAME
labels:
app: $APP_NAME
spec:
replicas: 1
selector:
matchLabels:
app: $APP_NAME
template:
metadata:
labels:
app: $APP_NAME
spec:
imagePullSecrets:
- name: my-registry-key
containers:
- name: $APP_NAME
image: $IMAGE_REPO:$IMAGE_NAME
imagePullPolicy: Always
ports:
- containerPort: 8080

11
kubernetes/service.yaml Normal file
View File

@@ -0,0 +1,11 @@
apiVersion: v1
kind: Service
metadata:
name: $APP_NAME
spec:
selector:
app: $APP_NAME
ports:
- protocol: TCP
port: 80
targetPort: 8080

View File

@@ -6,7 +6,7 @@
<groupId>com.example</groupId> <groupId>com.example</groupId>
<artifactId>java-maven-app</artifactId> <artifactId>java-maven-app</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.1.5</version>
<build> <build>
<plugins> <plugins>

View File

@@ -1,8 +0,0 @@
#!/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"

View File

@@ -0,0 +1,11 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>MyApp</title>
</head>
<body>
<h1>Welcome to Java Maven Application</h1>
<!-- add image here <img src="" width="" /> -->
</body>
</html>

View File

@@ -1,5 +1,5 @@
#Generated by Maven #Generated by Maven
#Thu Oct 29 12:55:55 CET 2020 #Sat Dec 05 14:30:39 UTC 2020
version=1.0-SNAPSHOT version=1.1.5
groupId=com.example groupId=com.example
artifactId=java-maven-app artifactId=java-maven-app

View File

@@ -1 +0,0 @@
com/example/Application.class

View File

@@ -1 +0,0 @@
/Users/nanajanashia/Demo-projects/Bootcamp/java-maven-app/src/main/java/com/example/Application.java

View File

@@ -1,4 +1,4 @@
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Test set: AppTest Test set: AppTest
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.061 sec Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.126 sec

View File

@@ -1,69 +1,64 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<testsuite tests="1" failures="0" name="AppTest" time="0.003" errors="0" skipped="0"> <testsuite tests="1" failures="0" name="AppTest" time="0.007" errors="0" skipped="0">
<properties> <properties>
<property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/> <property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
<property name="sun.boot.library.path" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home/jre/lib"/> <property name="sun.boot.library.path" value="/usr/local/openjdk-8/jre/lib/amd64"/>
<property name="java.vm.version" value="25.202-b08"/> <property name="java.vm.version" value="25.242-b08"/>
<property name="user.country.format" value="AT"/>
<property name="gopherProxySet" value="false"/>
<property name="java.vm.vendor" value="Oracle Corporation"/> <property name="java.vm.vendor" value="Oracle Corporation"/>
<property name="maven.multiModuleProjectDirectory" value="/Users/nanajanashia/Demo-projects/Bootcamp/java-maven-app"/> <property name="maven.multiModuleProjectDirectory" value="/var/jenkins_home/workspace/java-maven-app_jenkins-jobs"/>
<property name="java.vendor.url" value="http://java.oracle.com/"/> <property name="java.vendor.url" value="http://java.oracle.com/"/>
<property name="path.separator" value=":"/> <property name="path.separator" value=":"/>
<property name="guice.disable.misplaced.annotation.check" value="true"/> <property name="guice.disable.misplaced.annotation.check" value="true"/>
<property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/> <property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/>
<property name="file.encoding.pkg" value="sun.io"/> <property name="file.encoding.pkg" value="sun.io"/>
<property name="user.country" value="GB"/>
<property name="sun.java.launcher" value="SUN_STANDARD"/> <property name="sun.java.launcher" value="SUN_STANDARD"/>
<property name="sun.os.patch.level" value="unknown"/> <property name="sun.os.patch.level" value="unknown"/>
<property name="java.vm.specification.name" value="Java Virtual Machine Specification"/> <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
<property name="user.dir" value="/Users/nanajanashia/Demo-projects/Bootcamp/java-maven-app"/> <property name="user.dir" value="/var/jenkins_home/workspace/java-maven-app_jenkins-jobs"/>
<property name="java.runtime.version" value="1.8.0_202-b08"/> <property name="java.runtime.version" value="1.8.0_242-b08"/>
<property name="java.awt.graphicsenv" value="sun.awt.CGraphicsEnvironment"/> <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
<property name="java.endorsed.dirs" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home/jre/lib/endorsed"/> <property name="java.endorsed.dirs" value="/usr/local/openjdk-8/jre/lib/endorsed"/>
<property name="os.arch" value="x86_64"/> <property name="os.arch" value="amd64"/>
<property name="java.io.tmpdir" value="/var/folders/y3/bvgmrxg950x0f1z4zt3pby3c0000gn/T/"/> <property name="java.io.tmpdir" value="/tmp"/>
<property name="line.separator" value=" <property name="line.separator" value="
"/> "/>
<property name="java.vm.specification.vendor" value="Oracle Corporation"/> <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
<property name="os.name" value="Mac OS X"/> <property name="os.name" value="Linux"/>
<property name="classworlds.conf" value="/usr/local/Cellar/maven/3.6.0/libexec/bin/m2.conf"/> <property name="classworlds.conf" value="/var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/Maven/bin/m2.conf"/>
<property name="sun.jnu.encoding" value="UTF-8"/> <property name="sun.jnu.encoding" value="UTF-8"/>
<property name="java.library.path" value="/Users/nanajanashia/Library/Java/Extensions:/Library/Java/Extensions:/Network/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java:."/> <property name="java.library.path" value="/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib"/>
<property name="maven.conf" value="/usr/local/Cellar/maven/3.6.0/libexec/conf"/> <property name="maven.conf" value="/var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/Maven/conf"/>
<property name="java.specification.name" value="Java Platform API Specification"/> <property name="java.specification.name" value="Java Platform API Specification"/>
<property name="java.class.version" value="52.0"/> <property name="java.class.version" value="52.0"/>
<property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/> <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
<property name="os.version" value="10.14.6"/> <property name="os.version" value="5.4.0-51-generic"/>
<property name="library.jansi.path" value="/usr/local/Cellar/maven/3.6.0/libexec/lib/jansi-native"/> <property name="library.jansi.path" value="/var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/Maven/lib/jansi-native"/>
<property name="http.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/> <property name="user.home" value="/var/jenkins_home"/>
<property name="user.home" value="/Users/nanajanashia"/> <property name="user.timezone" value="Etc/UTC"/>
<property name="user.timezone" value="Europe/Vienna"/> <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
<property name="java.awt.printerjob" value="sun.lwawt.macosx.CPrinterJob"/>
<property name="java.specification.version" value="1.8"/> <property name="java.specification.version" value="1.8"/>
<property name="file.encoding" value="UTF-8"/> <property name="file.encoding" value="UTF-8"/>
<property name="user.name" value="nanajanashia"/> <property name="user.name" value="jenkins"/>
<property name="java.class.path" value="/usr/local/Cellar/maven/3.6.0/libexec/boot/plexus-classworlds-2.5.2.jar"/> <property name="java.class.path" value="/var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/Maven/boot/plexus-classworlds-2.6.0.jar"/>
<property name="java.vm.specification.version" value="1.8"/> <property name="java.vm.specification.version" value="1.8"/>
<property name="sun.arch.data.model" value="64"/> <property name="sun.arch.data.model" value="64"/>
<property name="java.home" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home/jre"/> <property name="java.home" value="/usr/local/openjdk-8/jre"/>
<property name="sun.java.command" value="org.codehaus.plexus.classworlds.launcher.Launcher test"/> <property name="sun.java.command" value="org.codehaus.plexus.classworlds.launcher.Launcher clean package"/>
<property name="java.specification.vendor" value="Oracle Corporation"/> <property name="java.specification.vendor" value="Oracle Corporation"/>
<property name="user.language" value="en"/> <property name="user.language" value="en"/>
<property name="awt.toolkit" value="sun.lwawt.macosx.LWCToolkit"/> <property name="awt.toolkit" value="sun.awt.X11.XToolkit"/>
<property name="java.vm.info" value="mixed mode"/> <property name="java.vm.info" value="mixed mode"/>
<property name="java.version" value="1.8.0_202"/> <property name="java.version" value="1.8.0_242"/>
<property name="java.ext.dirs" value="/Users/nanajanashia/Library/Java/Extensions:/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home/jre/lib/ext:/Library/Java/Extensions:/Network/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java"/> <property name="java.ext.dirs" value="/usr/local/openjdk-8/jre/lib/ext:/usr/java/packages/lib/ext"/>
<property name="sun.boot.class.path" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home/jre/lib/resources.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home/jre/lib/rt.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home/jre/lib/sunrsasign.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home/jre/lib/jsse.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home/jre/lib/jce.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home/jre/lib/charsets.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home/jre/lib/jfr.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home/jre/classes"/> <property name="securerandom.source" value="file:/dev/./urandom"/>
<property name="sun.boot.class.path" value="/usr/local/openjdk-8/jre/lib/resources.jar:/usr/local/openjdk-8/jre/lib/rt.jar:/usr/local/openjdk-8/jre/lib/sunrsasign.jar:/usr/local/openjdk-8/jre/lib/jsse.jar:/usr/local/openjdk-8/jre/lib/jce.jar:/usr/local/openjdk-8/jre/lib/charsets.jar:/usr/local/openjdk-8/jre/lib/jfr.jar:/usr/local/openjdk-8/jre/classes"/>
<property name="java.vendor" value="Oracle Corporation"/> <property name="java.vendor" value="Oracle Corporation"/>
<property name="maven.home" value="/usr/local/Cellar/maven/3.6.0/libexec"/> <property name="maven.home" value="/var/jenkins_home/tools/hudson.tasks.Maven_MavenInstallation/Maven"/>
<property name="file.separator" value="/"/> <property name="file.separator" value="/"/>
<property name="java.vendor.url.bug" value="http://bugreport.sun.com/bugreport/"/> <property name="java.vendor.url.bug" value="http://bugreport.sun.com/bugreport/"/>
<property name="sun.cpu.endian" value="little"/> <property name="sun.cpu.endian" value="little"/>
<property name="sun.io.unicode.encoding" value="UnicodeBig"/> <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
<property name="socksNonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
<property name="ftp.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
<property name="sun.cpu.isalist" value=""/> <property name="sun.cpu.isalist" value=""/>
</properties> </properties>
<testcase classname="AppTest" name="testApp" time="0.003"/> <testcase classname="AppTest" name="testApp" time="0.007"/>
</testsuite> </testsuite>

Binary file not shown.

View File

@@ -1,19 +0,0 @@
# 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

@@ -1,8 +0,0 @@
#!/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

View File

@@ -1,112 +0,0 @@
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
}

View File

@@ -1,24 +0,0 @@
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"
}