Skip to content

Fix release issues found while building v1.5.0-alpha.3 #13009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 20, 2017
Merged

Fix release issues found while building v1.5.0-alpha.3 #13009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
591b34d
Fix force pull behavior in release, correct changelog gen
smarterclayton Feb 20, 2017
f6edd3d
Origin image was creating a file at /usr/local/bin with imagebuilder
smarterclayton Feb 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions hack/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,9 @@ elif [[ "$( git rev-parse "${tag}" )" != "$( git rev-parse HEAD )" ]]; then
fi
commit="$( git rev-parse ${tag} )"

function removeimage() {
for i in $@; do
if docker inspect $i &>/dev/null; then
docker rmi $i
fi
if docker inspect docker.io/$i &>/dev/null; then
docker rmi docker.io/$i
fi
done
}

# Ensure that the build is using the latest public base images
removeimage openshift/origin-base openshift/origin-release openshift/origin-haproxy-router-base
docker pull openshift/origin-base
docker pull openshift/origin-release
docker pull openshift/origin-haproxy-router-base
docker pull "openshift/origin-base:latest"
docker pull "${OS_BUILD_ENV_IMAGE}"

OS_GIT_COMMIT="${commit}" hack/build-release.sh
hack/build-images.sh
Expand All @@ -40,4 +27,5 @@ echo
echo "Pushed ${tag} to DockerHub"
echo "1. Push tag to GitHub with: git push origin --tags # (ensure you have no extra tags in your environment)"
echo "2. Create a new release on the releases page and upload the built binaries in _output/local/releases"
echo "3. Send an email"
echo "3. Send an email"
echo
4 changes: 2 additions & 2 deletions hack/update-changelog.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ function component() {
if [[ "${new}" != "${old}" ]]; then
version=$(go run tools/godepversion/godepversion.go /tmp/godeps.new $3 comment)
echo "- Updated to $1 [$version + patches](https://github.com/$2/commits/$new)"
git log --grep=UPSTREAM --no-merges --pretty='tformat:%H' $from..$to -- vendor/$4 | \
xargs -L 1 /bin/sh -c 'echo " - $( git show -s --pretty=tformat:%s $1 | cut -f 2- -d " " ) [\\$( git log $to ^$1 --merges --ancestry-path --pretty="tformat:%s" | tail -1 | cut -f 4 -d " " )](https://github.com/$repo/pull/$( git log $to ^$1 --merges --ancestry-path --pretty="tformat:%s" | tail -1 | cut -f 4 -d " " | cut -c 2- ))"' '' | sort -n
fi
git log --grep=UPSTREAM --no-merges --pretty='tformat:%H' $from..$to -- vendor/$4 | \
xargs -L 1 /bin/sh -c 'echo " - $( git show -s --pretty=tformat:%s $1 | cut -f 2- -d " " ) [\\$( git log $to ^$1 --merges --ancestry-path --pretty="tformat:%s" | tail -1 | cut -f 4 -d " " )](https://github.com/$repo/pull/$( git log $to ^$1 --merges --ancestry-path --pretty="tformat:%s" | tail -1 | cut -f 4 -d " " | cut -c 2- ))"' '' | sort -n
fi
}

Expand Down
6 changes: 2 additions & 4 deletions images/origin/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
#
FROM openshift/origin-base

COPY system-container/system-container-wrapper.sh /usr/local/bin/
COPY system-container/config.json.template system-container/manifest.json system-container/service.template /exports/
COPY bin/openshift /usr/bin/openshift
RUN ln -s /usr/bin/openshift /usr/bin/oc && \
ln -s /usr/bin/openshift /usr/bin/oadm && \
Expand All @@ -31,8 +33,4 @@ ENV HOME=/root \
WORKDIR /var/lib/origin
EXPOSE 8443 53

# files required to run as a system container
COPY system-container/system-container-wrapper.sh /usr/local/bin
COPY system-container/config.json.template system-container/manifest.json system-container/service.template /exports/

ENTRYPOINT ["/usr/bin/openshift"]