diff --git a/Dockerfile b/Dockerfile index 4a5c8d2..3abddd6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,6 @@ FROM postgres +ARG GIT_COMMIT="" +RUN echo "GIT_COMMIT = ${GIT_COMMIT}" COPY ./initdb.sh /docker-entrypoint-initdb.d/initdb.sh +CMD echo 'echo "git commit = ${GIT_COMMIT}"' >> /docker-entrypoint-initdb.d/initdb.sh EXPOSE 5432 diff --git a/deploy.sh b/deploy.sh index 83f7f0d..4ad34dc 100644 --- a/deploy.sh +++ b/deploy.sh @@ -7,7 +7,7 @@ REPO="sartography/cr-connect-$APP" TAG=$(if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo "$TRAVIS_BRANCH" ; fi) COMMIT=${TRAVIS_COMMIT::8} -docker build -f Dockerfile -t "$REPO:$COMMIT" . +docker build -f Dockerfile -t "$REPO:$COMMIT" --build-arg GIT_COMMIT="$REPO:$COMMIT" . docker tag "$REPO:$COMMIT" "$REPO:$TAG" docker tag "$REPO:$COMMIT" "$REPO:travis-$TRAVIS_BUILD_NUMBER" docker push "$REPO"