jketreno/intel-media-ffmpeg
1
0
Fork 0
Code Issues Activity

finalizing build files

Browse Source
This commit is contained in:
Jason L Hannan 2019-10-07 14:17:09 -07:00
parent da544904ae
commit 33c9ea22dd
4 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -1,9 +1,7 @@
.PHONY: all images all: build_ubuntu
all: Dockerfile .PHONY: all
Dockerfile: Dockerfile.solution templates/*.in SOLUTION MANIFEST build_ubuntu: Dockerfile.solution templates/*.in SOLUTION MANIFEST
@scripts/build-dockerfile @scripts/build-dockerfile
@scripts/build-images
images:
@scripts/build-images

11
scripts/build-dockerfile
View File

@ -2,8 +2,15 @@
# Bring in the variables from SOLUTION file # Bring in the variables from SOLUTION file
# #
export $(grep -v '^#' SOLUTION | xargs -d '\n') # Determine if it is Mac OS and switch to use gxargs instead
export $(grep -v '^#' MANIFEST | xargs -d '\n') CMD=xargs
if [ $(which system_profiler) ]; then
CMD=gxargs
fi
export $(grep -v '^#' SOLUTION | ${CMD} -d '\n')
export $(grep -v '^#' MANIFEST | ${CMD} -d '\n')
# Remove the Dockerfile if it exists; should check # Remove the Dockerfile if it exists; should check
# if it is clean first, and abort if not. # if it is clean first, and abort if not.

11
scripts/build-images
View File

@ -2,8 +2,15 @@
# Bring in the variables from SOLUTION file # Bring in the variables from SOLUTION file
# #
export $(grep -v '^#' SOLUTION | xargs -d '\n') # Determine if it is Mac OS and switch to use gxargs instead
export $(grep -v '^#' MANIFEST | xargs -d '\n') CMD=xargs
if [ $(which system_profiler) ]; then
CMD=gxargs
fi
export $(grep -v '^#' SOLUTION | ${CMD} -d '\n')
export $(grep -v '^#' MANIFEST | ${CMD} -d '\n')
docker build . -t ${CONTAINER}:agama-${AGAMA_VERSION} || { docker build . -t ${CONTAINER}:agama-${AGAMA_VERSION} || {
cat << EOM cat << EOM

10
scripts/clean-image.sh
View File

@ -2,7 +2,13 @@
# Bring in the variables from SOLUTION file # Bring in the variables from SOLUTION file
# #
export $(grep -v '^#' SOLUTION | xargs -d '\n') # Determine if it is Mac OS and switch to use gxargs instead
export $(grep -v '^#' MANIFEST | xargs -d '\n') CMD=xargs
if [ $(which system_profiler) ]; then
CMD=gxargs
fi
export $(grep -v '^#' SOLUTION | ${CMD} -d '\n')
export $(grep -v '^#' MANIFEST | ${CMD} -d '\n')
docker rmi ${REPO_URL}/${CONTAINER}:devel docker rmi ${REPO_URL}/${CONTAINER}:devel