Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
73be5f3
generators working but incomplete
Jul 17, 2019
1737e2e
all implementations built
Jul 17, 2019
e70f58b
args working for version implementation
Jul 17, 2019
c374491
get request workingggg
Jul 17, 2019
5f063e2
Merge pull request #1 from kryan1622/microservices
kryan1622 Jul 17, 2019
3368e01
working on connector image
Jul 17, 2019
b9e199e
db connect and static website containers up
Jul 18, 2019
c5636ce
Merge pull request #2 from kryan1622/database
kryan1622 Jul 18, 2019
8182541
dockerised server on own container
Jul 18, 2019
0e2ea0f
Merge pull request #3 from kryan1622/docker_notify_nginx
kryan1622 Jul 18, 2019
310c45d
containers running but not communicating with docker-compose
Jul 18, 2019
fdcc616
Merge pull request #4 from kryan1622/docker-compose
kryan1622 Jul 18, 2019
dda3280
database persisting
Jul 18, 2019
36cedf1
endpoints all working
Jul 18, 2019
dc84be5
frontend functions created
Jul 18, 2019
55045bf
Merge pull request #5 from kryan1622/frontend
kryan1622 Jul 18, 2019
b8e64b8
fixed url in javascript
Jul 19, 2019
c99d5ad
begin swarming
Jul 19, 2019
692b9d8
Merge pull request #6 from kryan1622/frontend
kryan1622 Jul 19, 2019
bf94182
added Jenkinsfile
Jul 19, 2019
fdfec2c
Merge pull request #7 from kryan1622/swarm-stack
kryan1622 Jul 19, 2019
c41ed74
added clean stage to Jenkinsfile
Jul 19, 2019
ad9be9d
Merge pull request #8 from kryan1622/swarm-stack
kryan1622 Jul 19, 2019
826f33d
edit Jenkinsfile
Jul 19, 2019
77a3a55
Merge pull request #9 from kryan1622/swarm-stack
kryan1622 Jul 19, 2019
a681cb0
added jenkins mount
Jul 19, 2019
546530f
jenkinsfile
Jul 19, 2019
0847c46
Update Jenkinsfile
kryan1622 Jul 19, 2019
4f4fa51
Update Jenkinsfile
kryan1622 Jul 19, 2019
255fa0e
Update docker-compose.yaml
kryan1622 Jul 19, 2019
0881aed
Update Jenkinsfile
kryan1622 Jul 19, 2019
33ac04a
Update docker-compose.yaml
kryan1622 Jul 19, 2019
f2cb908
Update Jenkinsfile
kryan1622 Jul 19, 2019
56d2525
Update Jenkinsfile
kryan1622 Jul 19, 2019
778fc16
Update Jenkinsfile
kryan1622 Jul 19, 2019
3d6d8a7
Update Jenkinsfile
kryan1622 Jul 19, 2019
fd72aa8
Update Jenkinsfile
kryan1622 Jul 19, 2019
5646372
Update Jenkinsfile
kryan1622 Jul 19, 2019
0c310a1
Update Jenkinsfile
kryan1622 Jul 19, 2019
d6eee46
Update Jenkinsfile
kryan1622 Jul 19, 2019
c2373c2
Update Jenkinsfile
kryan1622 Jul 19, 2019
2fc1473
Update Jenkinsfile
kryan1622 Jul 19, 2019
faa6641
Update Jenkinsfile
kryan1622 Jul 19, 2019
3e38e39
edited index to check if pipeline works
Jul 19, 2019
1177f0f
Merge branch 'jenkins-container' of https://github.com/kryan1622/LAFB…
Jul 19, 2019
5a75d98
reverted index - it does work
Jul 19, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
pipeline{
agent any
stages{
stage('---build---'){
steps{
sh "docker-compose build"
}
}
stage('---push---'){
steps{
sh "docker-compose push"
}
}
stage('---deploy---'){
steps{
sh "docker stack deploy --compose-file docker-compose.yaml devops"
}
}
}
}


1 change: 1 addition & 0 deletions account/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
9 changes: 9 additions & 0 deletions account/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM node:10
ARG FILE_VERSION=1
WORKDIR /usr/src/app
COPY package*.json ./
RUN npm install
COPY . .
COPY routes/account${FILE_VERSION}.js routes/account.js
EXPOSE 5002
ENTRYPOINT [ "node", "server.js" ]
Loading