Updates per aptalca

This commit is contained in:
TheCaptain989
2020-10-07 20:13:39 -05:00
parent 85ef895b43
commit 52ce0f24f7
4 changed files with 2 additions and 43 deletions
-14
View File
@@ -22,32 +22,18 @@ jobs:
script:
# Build variables
- VERSION=$(git describe --tags --always)
- VCS_REF=$(git rev-parse --short HEAD)
- BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
# Build image
- docker build --no-cache
--build-arg VERSION=${VERSION}
--build-arg VCS_REF=${VCS_REF}
--build-arg BUILD_DATE=${BUILD_DATE}
--build-arg DOCKERHUB=${DOCKERHUB}
--build-arg BASEIMAGE=${BASEIMAGE}
--build-arg MODNAME=${MODNAME}
-t ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}-${TRAVIS_COMMIT} .
- stage: BuildImage
if: (NOT (type IN (pull_request)))
script:
# Build variables
- VERSION=$(git describe --tags --always)
- VCS_REF=$(git rev-parse --short HEAD)
- BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
# Build image
- docker build --no-cache
--build-arg VERSION=${VERSION}
--build-arg VCS_REF=${VCS_REF}
--build-arg BUILD_DATE=${BUILD_DATE}
--build-arg DOCKERHUB=${DOCKERHUB}
--build-arg BASEIMAGE=${BASEIMAGE}
--build-arg MODNAME=${MODNAME}
-t ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}-${TRAVIS_COMMIT} .
- docker tag ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}-${TRAVIS_COMMIT} ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}
# Login to DockerHub