MISP
/
misp-docker
mirror of https://github.com/MISP/misp-docker
2
0
Fork 0
Code Issues Releases Wiki Activity

Remove env call, and copy to server build hook

pull/1/head
Jason Kendall 2020-01-30 10:45:07 -05:00
parent 3a61d5068d
commit 9932519113
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/hooks/build
View File

@ -6,8 +6,6 @@ echo "[***] Build hook running"
export $(grep -v '^#' ../.env | xargs) export $(grep -v '^#' ../.env | xargs)
env
docker build \ docker build \
--build-arg MISP_TAG=$MISP_TAG \ --build-arg MISP_TAG=$MISP_TAG \
--build-arg PHP_VER=$PHP_VER \ --build-arg PHP_VER=$PHP_VER \

2
server/hooks/build
View File

@ -7,6 +7,8 @@ echo "[***] Build hook running"
export $(grep -v '^#' ../.env | xargs) export $(grep -v '^#' ../.env | xargs)
docker build \ docker build \
--build-arg MISP_TAG=$MISP_TAG \
--build-arg PHP_VER=$PHP_VER \
--build-arg BUILD_RFC3339=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \ --build-arg BUILD_RFC3339=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
--build-arg COMMIT=$(git rev-parse --short HEAD) \ --build-arg COMMIT=$(git rev-parse --short HEAD) \
--build-arg VERSION=$(git describe --tags --always) \ --build-arg VERSION=$(git describe --tags --always) \