Skip to content

Commit

Permalink
replace .ContainerConfig by .Config
Browse files Browse the repository at this point in the history
This is due to a change in podman 1.0:
containers/podman#2023
  • Loading branch information
pkubatrh committed Jan 29, 2019
1 parent 47d6e39 commit a7759b9
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions tag.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ for dir in ${VERSIONS}; do
[ ! -e "${dir}/.image-id" ] && echo "-> Image for version $dir not built, skipping tag." && continue
pushd ${dir} > /dev/null
IMAGE_ID=$(cat .image-id)
name=$(docker inspect -f "{{.ContainerConfig.Labels.name}}" $IMAGE_ID)
version=$(docker inspect -f "{{.ContainerConfig.Labels.version}}" $IMAGE_ID)
name=$(docker inspect -f "{{.Config.Labels.name}}" $IMAGE_ID)
version=$(docker inspect -f "{{.Config.Labels.version}}" $IMAGE_ID)

echo "-> Tagging image '$IMAGE_ID' as '$name:$version' and '$name:latest'"
docker tag $IMAGE_ID "$name:$version"
Expand Down
2 changes: 1 addition & 1 deletion test-lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ ct_s2i_build_as_df()
pushd "$tmpdir"
# Check if the image is available locally and try to pull it if it is not
docker images "$src_image" &>/dev/null || echo "$s2i_args" | grep -q "pull-policy=never" || docker pull "$src_image"
user_id=$(docker inspect -f "{{.ContainerConfig.User}}" "$src_image")
user_id=$(docker inspect -f "{{.Config.User}}" "$src_image")
# Strip file:// from APP_PATH and copy its contents into current context
mkdir -p "$local_app"
cp -r "${app_path/file:\/\//}/." "$local_app"
Expand Down
2 changes: 1 addition & 1 deletion test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ for dir in ${VERSIONS}; do
pushd ${dir} > /dev/null
export IMAGE_ID=$(cat .image-id)
# Kept also IMAGE_NAME as some tests might still use that.
export IMAGE_NAME=$(docker inspect -f "{{.ContainerConfig.Labels.name}}" $IMAGE_ID)
export IMAGE_NAME=$(docker inspect -f "{{.Config.Labels.name}}" $IMAGE_ID)

if [ -n "${TEST_MODE}" ]; then
VERSION=$dir test/run
Expand Down

0 comments on commit a7759b9

Please sign in to comment.