valitydev/koffing
14
0
Fork 0
mirror of https://github.com/valitydev/koffing.git synced 2024-11-06 01:05:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Build from new base and add smoke test (#178)

Browse Source 
* Smoke test image

* New base image
This commit is contained in:
Timur 2017-11-03 15:52:42 +03:00 committed by GitHub
parent 8d83e976e2
commit 4d5396cd4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/node_modules/ /node_modules/
/dist/ /dist/
Dockerfile Dockerfile
.state

4
Jenkinsfile vendored
View File

@ -27,6 +27,10 @@ build('koffing', 'docker-host') {
sh 'make build_image' sh 'make build_image'
} }
runStage('test image') {
sh 'make test'
}
try { try {
if (env.BRANCH_NAME == 'master') { if (env.BRANCH_NAME == 'master') {
runStage('push image') { runStage('push image') {

8
Makefile
View File

@ -13,7 +13,7 @@ SERVICE_IMAGE_PUSH_TAG ?= $(SERVICE_IMAGE_TAG)
# Base image for the service # Base image for the service
BASE_IMAGE_NAME := service-fe BASE_IMAGE_NAME := service-fe
BASE_IMAGE_TAG := 0e86b4057cbf773232d9c04bb8d1cebfea78a088 BASE_IMAGE_TAG := 768cf0f40600e290060502e047dd2e86d4fd6020
BUILD_IMAGE_TAG := 55e987e74e9457191a5b4a7c5dc9e3838ae82d2b BUILD_IMAGE_TAG := 55e987e74e9457191a5b4a7c5dc9e3838ae82d2b
@ -40,3 +40,9 @@ build:
clean: clean:
rm -rf dist rm -rf dist
.state: build_image
echo $(SERVICE_IMAGE_TAG) > $@
test: .state
docker run --rm $(SERVICE_IMAGE_NAME):$(shell cat .state) nginx -T -c /etc/nginx/nginx.conf