Changed image names to be better and consistent (#505)

This commit is contained in:
Travis Reeder
2017-11-17 11:11:00 -08:00
committed by GitHub
parent b2b3e608b9
commit 7d467a2e4a
2 changed files with 23 additions and 13 deletions

View File

@@ -2,8 +2,8 @@
set -ex set -ex
user="fnproject" user="fnproject"
service="fnlb" image="fn-lb"
tag="latest" image_deprecated="fnlb"
# ensure working dir is clean # ensure working dir is clean
git status git status
@@ -28,14 +28,19 @@ echo "Version: $version"
make docker-build make docker-build
gtag=$service-$version gtag=$image-$version
git add -u git add -u
git commit -m "$service: $version release [skip ci]" git commit -m "$image: $version release [skip ci]"
git tag -f -a "$gtag" -m "version $gtag" git tag -f -a "$gtag" -m "version $gtag"
git push git push
git push origin $gtag git push origin $gtag
# Finally tag and push docker images # Finally tag and push docker images
docker tag $user/$service:$tag $user/$service:$version docker tag $user/$image:latest $user/$image:$version
docker push $user/$service:$version docker push $user/$image:$version
docker push $user/$service:$tag docker push $user/$image:latest
# Deprecated images, should remove this sometime in near future
docker tag $user/$image_deprecated:latest $user/$image_deprecated:$version
docker push $user/$image_deprecated:$version
docker push $user/$image_deprecated:latest

View File

@@ -2,8 +2,8 @@
set -ex set -ex
user="fnproject" user="fnproject"
service="functions" image="fn-server"
tag="latest" image_deprecated="functions"
# ensure working dir is clean # ensure working dir is clean
git status git status
@@ -29,15 +29,20 @@ echo "Version: $version"
make docker-build make docker-build
git add -u git add -u
git commit -m "$service: $version release [skip ci]" git commit -m "$image: $version release [skip ci]"
git tag -f -a "$version" -m "version $version" git tag -f -a "$version" -m "version $version"
git push git push
git push origin $version git push origin $version
# Finally tag and push docker images # Finally tag and push docker images
docker tag $user/$service:$tag $user/$service:$version docker tag $user/$image:latest $user/$image:$version
docker push $user/$service:$version docker push $user/$image:$version
docker push $user/$service:$tag docker push $user/$image:latest
# Deprecated images, should remove this sometime in near future
docker tag $user/$image_deprecated:latest $user/$image_deprecated:$version
docker push $user/$image_deprecated:$version
docker push $user/$image_deprecated:latest
cd fnlb cd fnlb
./release.sh ./release.sh