Skip to content

Commit

Permalink
Merge pull request #29 from binbashar/feature/docker-buildx-multi-arch
Browse files Browse the repository at this point in the history
Feature/docker buildx multi arch
  • Loading branch information
exequielrafaela authored May 28, 2022
2 parents 55f2767 + 91d44bc commit 0ddb110
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 1,222 deletions.
26 changes: 26 additions & 0 deletions docker/docker-hub-build-push-single-arg-multi-arch.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
-include ../../@bin/config/base.mk

.PHONY: help
SHELL := /bin/bash
DOCKER_REPO_NAME := binbash

help:
@echo 'Available Commands:'
@egrep '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":"}; { if ($$3 == "") { printf " - \033[36m%-18s\033[0m %s\n", $$1, $$2 } else { printf " - \033[36m%-18s\033[0m %s\n", $$2, $$3 }}'

#==============================================================#
# DOCKER #
#==============================================================#
build: ## build docker image
docker buildx build \
--platform linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7,linux/arm/v8 \
-t ${DOCKER_REPO_NAME}/${DOCKER_IMG_NAME}:${DOCKER_TAG} \
--build-arg DOCKER_TAG='${DOCKER_TAG}' .

push: ## push docker image to registry
docker buildx build \
--platform linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7,linux/arm/v8 \
--push \
-t ${DOCKER_REPO_NAME}/${DOCKER_IMG_NAME}:${DOCKER_TAG} \
--build-arg DOCKER_TAG='${DOCKER_TAG}' .

2 changes: 1 addition & 1 deletion mkdocs/mkdocs-material.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ SHELL := /bin/bash

LOCAL_OS_USER_ID = $(shell id -u)
LOCAL_OS_GROUP_ID = $(shell id -g)
MKDOCS_DOCKER_IMG := squidfunk/mkdocs-material:8.1.8
MKDOCS_DOCKER_IMG := squidfunk/mkdocs-material:8.2.16
# GOOGLE_ANALYTICS_KEY: must be preset as os.ENV var

help:
Expand Down
141 changes: 0 additions & 141 deletions terraform11/terraform11-subfolder.mk

This file was deleted.

141 changes: 0 additions & 141 deletions terraform11/terraform11.mk

This file was deleted.

75 changes: 0 additions & 75 deletions terraform12/terraform12-import-rm-subfolder.mk

This file was deleted.

Loading

0 comments on commit 0ddb110

Please sign in to comment.