changed docker image use to buildspecific instead of gloabl

This commit is contained in:
Marcel Otte 2016-04-18 20:32:37 +02:00
parent 750bf518ce
commit 9527611da8
2 changed files with 3 additions and 1 deletions

1
.gitignore vendored
View File

@ -5,3 +5,4 @@
*.war *.war
*.ear *.ear
/bin /bin
*/.settings/

View File

@ -1,8 +1,8 @@
image: archlinux_gcc5.3_qt5
stages: stages:
- build - build
build-c: build-c:
image: archlinux_gcc5.3_qt5
stage: build stage: build
script: script:
- cd c; make - cd c; make
@ -12,6 +12,7 @@ build-c:
- c/tests-* - c/tests-*
build-cpp: build-cpp:
image: archlinux_gcc5.3_qt5
stage: build stage: build
script: script:
- cd cpp; mkdir build; cd build - cd cpp; mkdir build; cd build