Skip to content

Pass arguments from Makefile to docker build script #495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 8, 2022
Merged

Pass arguments from Makefile to docker build script #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cf5b89
Pass arguments from Makefile to docker build script
nguyer Feb 8, 2022
22c707c
Rename DOCKER_ARGS in build script
nguyer Feb 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/docker_main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,12 @@ jobs:

- name: Build
run: |
docker build \
make DOCKER_ARGS='\
--label commit=$GITHUB_SHA \
--label build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
--label tag=${{ steps.build_tag_generator.outputs.BUILD_TAG }} \
--tag ghcr.io/hyperledger/firefly:${{ steps.build_tag_generator.outputs.BUILD_TAG }} .
--tag ghcr.io/hyperledger/firefly:${{ steps.build_tag_generator.outputs.BUILD_TAG }}' \
docker

- name: Tag release
run: docker tag ghcr.io/hyperledger/firefly:${{ steps.build_tag_generator.outputs.BUILD_TAG }} ghcr.io/hyperledger/firefly:head
Expand Down
11 changes: 3 additions & 8 deletions .github/workflows/docker_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,14 @@ jobs:
with:
fetch-depth: 0

- name: Filter Helm Releases
run: |
echo "Detected that GitHub release is for the Helm chart... aborting this build as a result."
exit 1
if: startsWith(github.ref, 'refs/tags/helm-v')

- name: Build
run: |
docker build \
make DOCKER_ARGS='\
--label commit=$GITHUB_SHA \
--label build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
--label tag=${GITHUB_REF##*/} \
--tag ghcr.io/hyperledger/firefly:${GITHUB_REF##*/} .
--tag ghcr.io/hyperledger/firefly:${GITHUB_REF##*/}' \
docker

- name: Tag release
if: github.event.action == 'released'
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@ swagger:
manifest:
./manifestgen.sh
docker:
./docker_build.sh
./docker_build.sh $(DOCKER_ARGS)
2 changes: 2 additions & 0 deletions docker_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

echo $@

if [[ ! -x `which jq` ]]; then echo "Please install \"jq\" to continue"; exit 1; fi

Expand Down Expand Up @@ -44,4 +45,5 @@ docker build \
--build-arg BASE_TAG=$BASE_TAG \
--build-arg UI_TAG=$UI_TAG \
--build-arg UI_RELEASE=$UI_RELEASE \
$@ \
.