From 316b9d0b154641acf83f4152eaefd951efbbfc88 Mon Sep 17 00:00:00 2001 From: Matthew Baggett Date: Thu, 15 Aug 2019 15:51:10 +0200 Subject: [PATCH] Hopefully more build successes if marshall can be built by all builders... --- .travis.yml | 6 +++--- Makefile | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7fb26a9..b4e5106 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,10 +11,10 @@ before_install: - sudo mv docker-compose /usr/local/bin before_script: - - docker --version - docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY - - printenv | sort - - echo $BUILD + - git rev-parse --short HEAD > marshall/marshall_version + - date +%Y-%m-%d\ %H:%M:%S > marshall/marshall_build_date + - hostname > marshall/marshall_build_host script: - make $BUILD diff --git a/Makefile b/Makefile index 4536043..62b1abd 100644 --- a/Makefile +++ b/Makefile @@ -147,9 +147,6 @@ PHP_PACKAGES_73=mysql-client \ # ░ ░ ░ ▒ ░░ ░ ░ ░ ░ ░ ░░ ░ ░ ▒ ░ ░ ░ ░ # ░ ░ ░ ░ ░ ░ ░ ░ ░ ░ ░ ░ ░ ░ gone/marshall: - git rev-parse --short HEAD > marshall/marshall_version - date +%Y-%m-%d\ %H:%M:%S > marshall/marshall_build_date - hostname > marshall/marshall_build_host $(CMD_BUILD) -t gone/marshall:latest --target=marshall . # ██▓███ ██░ ██ ██▓███ ▄████▄ ▒█████ ██▀███ ▓█████