Docker - rename .ci directory, shorter commit in tag

EdgedesignCZ · Sep 24, 2017 · 691852d · 691852d
1 parent aa4d0f4
commit 691852d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/.ci/Dockerfile → .docker/Dockerfile b/.ci/Dockerfile → .docker/Dockerfile
diff --git a/.ci/build-docker-image → .docker/build-image b/.ci/build-docker-image → .docker/build-image
@@ -2,7 +2,7 @@
 
 APP_DIR="./"
 DOCKER_REPO="zdenekdrahos/phpqa"
-DOCKER_FILE=".ci/Dockerfile"
+DOCKER_FILE=".docker/Dockerfile"
 DOCKER_TAG=""
 
 run () {
@@ -11,7 +11,7 @@ run () {
 }
 
 load_docker_variables () {
-    DOCKER_TAG="$DOCKER_REPO:${TRAVIS_TAG:-$TRAVIS_COMMIT}"
+    DOCKER_TAG="$DOCKER_REPO:${TRAVIS_TAG:-$TRAVIS_COMMIT:0:7}"
 
     echo "Dockefile: $DOCKER_FILE"
     echo "Build context: $APP_DIR"

diff --git a/.dockerignore b/.dockerignore
@@ -1,6 +1,5 @@
 .git*
 .docker*
-.ci
 bin/deploy-report.sh
 bin/ci.sh
 build

diff --git a/.gitattributes b/.gitattributes
@@ -1,6 +1,6 @@
 /tests export-ignore
 /bin export-ignore
-/.ci export-ignore
+/.docker export-ignore
 /.dockerignore export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore

diff --git a/.travis.yml b/.travis.yml
@@ -28,13 +28,13 @@ script:
 # http://blog.wyrihaximus.net/2015/07/composer-cache-on-travis/
 deploy:
   - provider: script
-    script: .ci/build-docker-image
+    script: .docker/build-image
     skip_cleanup: true
     on:
       tags: true
       php: 7.0
   - provider: script
-    script: ls -la .ci && .ci/build-docker-image
+    script: ls -la .docker && .docker/build-image
     skip_cleanup: true
     on:
       branch: docker