valitydev/image-riak-base
14
0
Fork 0
mirror of https://github.com/valitydev/image-riak-base.git synced 2024-11-06 10:15:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

files/packer.sh: salt-2015.8.11 update.

Browse Source
This commit is contained in:
Grigory Antsiferov 2016-08-19 17:53:41 +03:00
parent 94d39b081c
commit 938d056026
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -29,13 +29,13 @@ repos: $(REPOS_TARGET)
$(eval COMMIT := $(shell git rev-parse HEAD))
$(eval TAG := $(shell date +%s)-$(COMMIT))
$(eval BRANCH := $(shell \
if [ "HEAD" != $(git rev-parse --abbrev-ref HEAD) ]; then \
if [[ "HEAD" != $(git rev-parse --abbrev-ref HEAD) ]]; then \
echo $(git rev-parse --abbrev-ref HEAD); \
elif [ -n "$BRANCH_NAME" ]; then \
echo $BRANCH_NAME; \
else \
echo $(git name-rev --name-only HEAD); \
fi))
fi)
$(eval STAGE3 := $(shell cat .latest-stage3))
$(DOCKER) run -v `pwd`:/tmp/pwd -w /tmp/repack busybox /bin/sh -c \
"tar xjf /tmp/pwd/$(STAGE3); tar cjf /tmp/pwd/$(STAGE3).repack ."

2
files/packer.sh
View File

@ -44,7 +44,7 @@ eend $? "Failed" || exit $?
ebegin "Setting bootstrap flags"
mkdir -p /etc/portage/package.{accept_keywords,keywords,use,env} \
&& cat <<'EOF'>> /etc/portage/package.keywords/bootstrap
=app-admin/salt-2015.8.8 ~amd64
=app-admin/salt-2015.8.11 ~amd64
net-libs/zeromq:0/5 ~amd64
<dev-python/pyzmq-16 ~amd64
dev-python/cffi ~amd64