Merge pull request #5 from sartography/chore/github_branches_to_docker_tags

Adds git commit message to Dockerfile entrypoint
This commit is contained in:
Aaron Louie 2020-05-07 15:10:10 -04:00 committed by GitHub
commit 574464ac13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions

View File

@ -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

View File

@ -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"