Skip to content

Commit e883ff6

Browse files
committed
Merge branch 'main' of github.com:KryptonGuy/profile_api_flask
Merging jenkins
2 parents f17f0a1 + 3ec2006 commit e883ff6

File tree

3 files changed

+32
-5
lines changed

3 files changed

+32
-5
lines changed

Jenkinsfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pipeline {
2-
agent {label 'python-alpine'}
2+
agent {label 'jenkins-docker'}
33
options{
44
buildDiscarder(logRotator(numToKeepStr: '5', daysToKeepStr: '5'))
55
timestamps()
@@ -11,10 +11,12 @@ pipeline {
1111
}
1212

1313
stages{
14+
1415
stage('Build') {
1516
steps{
17+
sh "pwd"
1618
script {
17-
dockerImage = docker.build registry + ":$BUILD_NUMBER"
19+
dockerImage = docker.build(registry + ":$BUILD_NUMBER", "./app")
1820
}
1921
}
2022
}
@@ -28,4 +30,4 @@ pipeline {
2830
}
2931
}
3032
}
31-
}
33+
}

app/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM gcr.io/google_appengine/python
1+
FROM python:3
22

33
RUN mkdir -p /home/project/app
44
WORKDIR /home/project/app
55
COPY requirements.txt /home/project/app
66
RUN pip install --no-cache-dir -r requirements.txt
77

8-
COPY . /home/project/app
8+
COPY . /home/project/app

app/requirements.txt

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
aniso8601==9.0.1
2+
click==7.1.2
3+
colorama==0.4.4
4+
Flask==1.1.4
5+
Flask-Cors
6+
Flask-Markdown
7+
flask-marshmallow
8+
Flask-restful
9+
flask-restful-swagger
10+
Flask-sqlalchemy
11+
greenlet
12+
importlib-metadata
13+
itsdangerous
14+
Jinja2
15+
Markdown
16+
MarkupSafe
17+
marshmallow
18+
marshmallow-sqlalchemy
19+
PyMySQL
20+
pytz
21+
six
22+
SQLAlchemy
23+
SQLAlchemy-Utils
24+
Werkzeug
25+
zipp

0 commit comments

Comments
 (0)