tag latest build
This commit is contained in:
parent
cbe8bdad3d
commit
7e71261cad
|
@ -19,7 +19,5 @@ services:
|
|||
- webnet
|
||||
logging:
|
||||
driver: journald
|
||||
volumes:
|
||||
- /run/mysqld/mysqld.sock:/run/mysqld/mysqld.sock
|
||||
networks:
|
||||
webnet:
|
||||
|
|
9
image.sh
9
image.sh
|
@ -7,7 +7,11 @@ export DOCKER_REGISTRY="registry.bij1.org"
|
|||
export DOCKER_BUILDKIT=1
|
||||
|
||||
if [ -n "$CI_COMMIT_SHA" ]; then
|
||||
export VERSION="${CI_COMMIT_SHA}"
|
||||
if [ -n "$CI_COMMIT_TAG" ]; then
|
||||
export VERSION="${CI_COMMIT_TAG}"
|
||||
else
|
||||
export VERSION="${CI_COMMIT_SHA}"
|
||||
fi
|
||||
export BRANCH_CACHE_TAG=$CI_COMMIT_BRANCH
|
||||
else
|
||||
export VERSION=$(git rev-parse --short HEAD)
|
||||
|
@ -18,15 +22,18 @@ fi
|
|||
export DOCKER_IMAGE=${PROJECT}:$VERSION
|
||||
export CACHE_FROM=${PROJECT}:$BRANCH_CACHE_TAG
|
||||
export TAG_VERSION="$DOCKER_REGISTRY/$DOCKER_IMAGE"
|
||||
export TAG_LATEST="$DOCKER_REGISTRY/${PROJECT}:latest"
|
||||
|
||||
build() {
|
||||
docker build --file ./Dockerfile --cache-from ${CACHE_FROM} --tag ${DOCKER_IMAGE} .
|
||||
docker tag $DOCKER_IMAGE $TAG_VERSION
|
||||
docker tag $DOCKER_IMAGE $TAG_LATEST
|
||||
}
|
||||
|
||||
push() {
|
||||
docker login -p ${REGISTRY_PASSWORD} -u docker $DOCKER_REGISTRY
|
||||
docker push $TAG_VERSION
|
||||
docker push $TAG_LATEST
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue