rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-31 22:32:14 +00:00
Code Issues Releases Wiki Activity

split makefile into local and in-docker

Browse Source
This commit is contained in:
Ivan Mikushin
2015-08-06 00:46:22 +05:00
parent 8c9fa7ba2f
commit 9436b0da9a
7 changed files with 101 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/build-common
View File

@@ -1,3 +1,2 @@
ARTIFACTS=$(pwd)/assets
BUILD=$(pwd)/build
DIST=$(pwd)/dist

2
scripts/ci
View File

@@ -9,4 +9,4 @@ fi
docker build -t ros-build-base -f Dockerfile.base .
docker build -t ros-build .
echo make package | docker run -v /var/run/docker.sock:/var/run/docker.sock --name=ros-build -i ros-build
./scripts/docker-run.sh make -f Makefile.docker dist

5
scripts/docker-run.sh Executable file
View File

@@ -0,0 +1,5 @@
#!/bin/bash
set -e
docker rm -fv ros-build > /dev/null 2>&1 || :
exec docker run -v /var/run/docker.sock:/var/run/docker.sock --name=ros-build ros-build "$@"

2
scripts/run
View File

@@ -12,7 +12,7 @@ KERNEL=${BASE}/dist/artifacts/vmlinuz
INITRD=${BASE}/dist/artifacts/initrd
NO_COMPRESS_INITRD=${INITRD}.none
HD=${BASE}/state/empty-hd.img
HD_GZ=${ARTIFACTS}/empty-hd.img.gz
HD_GZ=${BASE}/assets/empty-hd.img.gz
INITRD_TMP=${BUILD}/$(sha1sum ${INITRD} | awk '{print $1}')
INITRD_CURRENT=${BUILD}/initrd-current
INITRD_TEST=${BUILD}/initrd.test