1
0

Split build-dockerfile into build-dockerfile and build-images

Signed-off-by: James P. Ketrenos <james.p.ketrenos@intel.com>
This commit is contained in:
James P. Ketrenos 2019-09-19 15:38:59 -07:00
parent a865de8372
commit 3caec6a48e
2 changed files with 36 additions and 13 deletions

View File

@ -53,21 +53,11 @@ EOM
envsubst < templates/ending.in >> Dockerfile envsubst < templates/ending.in >> Dockerfile
docker build . -t ${CONTAINER}:agama-${AGAMA_VERSION}
cat << EOM cat << EOM
If the build looks good, you should commit the changes Dockerfile has been updated.
to Dockerfile and tag it as agama-${AGAMA_VERSION}:
git commit -s -a -m "Build of agama-${AGAMA_VERSION}" To build the image, you can run scripts/build-images
git tag -f agama-${AGAMA_VERSION}
To push to Harbor: EOF
docker tag ${CONTAINER}:agama-${AGAMA_VERSION} amr-registry.caas.intel.com/vtt-osgc/solutions/${CONTAINER}:agama-${AGAMA_VERSION}
docker tag ${CONTAINER}:agama-${AGAMA_VERSION} amr-registry.caas.intel.com/vtt-osgc/solutions/${CONTAINER}:latest
docker push amr-registry.caas.intel.com/vtt-osgc/solutions/${CONTAINER}:agama-${AGAMA_VERSION}
docker push amr-registry.caas.intel.com/vtt-osgc/solutions/${CONTAINER}:latest
EOM

33
scripts/build-images Executable file
View File

@ -0,0 +1,33 @@
#!/bin/bash
# Bring in the variables from SOLUTION file
#
export $(grep -v '^#' SOLUTION | xargs -d '\n')
export $(grep -v '^#' MANIFEST | xargs -d '\n')
docker build . -t ${CONTAINER}:agama-${AGAMA_VERSION}
cat << EOM
If the build looks good, you should commit the changes
to Dockerfile and tag it as agama-${AGAMA_VERSION}
git commit -s -a -m "Build of agama-${AGAMA_VERSION}"
git tag -f agama-${AGAMA_VERSION}
To push to Harbor:
docker tag ${CONTAINER}:agama-${AGAMA_VERSION} amr-registry.caas.intel.com/vtt-osgc/solutions/${CONTAINER}:agama-${AGAMA_VERSION}
docker push amr-registry.caas.intel.com/vtt-osgc/solutions/${CONTAINER}:agama-${AGAMA_VERSION}
If this is a build others might want, roll the 'devel' tag to it:
docker tag ${CONTAINER}:agama-${AGAMA_VERSION} amr-registry.caas.intel.com/vtt-osgc/solutions/${CONTAINER}:devel
docker push amr-registry.caas.intel.com/vtt-osgc/solutions/${CONTAINER}:devel
If this is a good build, then roll the 'latest' tag to it.
docker tag ${CONTAINER}:agama-${AGAMA_VERSION} amr-registry.caas.intel.com/vtt-osgc/solutions/${CONTAINER}:latest
docker push amr-registry.caas.intel.com/vtt-osgc/solutions/${CONTAINER}:latest
EOM