Skip to content
Snippets Groups Projects
Commit d2c87e5c authored by Nicola Worthington's avatar Nicola Worthington :speech_balloon:
Browse files

Merge branch 'makefile-convenience-multiarch-builds' into 'master'

Reduced architectures for manual build

See merge request !21
parents c403aa0f 75543232
Branches master
No related tags found
1 merge request!21Reduced architectures for manual build
Pipeline #1693629173 failed
......@@ -39,7 +39,7 @@ sast:
DOCKER_TLS_VERIFY: "1"
DOCKER_TLS_CERTDIR: "/certs"
DOCKER_CERT_PATH: "/certs/client"
MULTIARCH_PLATFORMS: "linux/arm64,linux/amd64,linux/arm/v6,linux/arm/v7,linux/s390x,linux/ppc64le"
MULTIARCH_PLATFORMS: "linux/arm64,linux/amd64,linux/arm/v6,linux/arm/v7,linux/s390x"
before_script:
- echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
- >
......
......@@ -7,7 +7,7 @@
# https://nicolaw.uk/#TiddlyWiki
#
ARG BASE_IMAGE=node:20.18-alpine3.19
ARG BASE_IMAGE=node:23.3-alpine3.19
FROM ${BASE_IMAGE} AS build
ARG TW_VERSION=5.3.6
......
......@@ -7,11 +7,11 @@
# https://nicolaw.uk/#TiddlyWiki
#
.PHONY: build push ami
.PHONY: build push ami release
.DEFAULT_GOAL := build
TW_VERSION = 5.3.6
BASE_IMAGE = node:20.18-alpine3.19
BASE_IMAGE = node:23.3-alpine3.19
REPOSITORY = nicolaw/tiddlywiki
USER = node
......@@ -21,24 +21,38 @@ IMAGE_TAGS = $(REPOSITORY):$(TW_VERSION) \
MAKEFILE_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
DOCKERFILE = Dockerfile
DOCKER_BUILDX_PLATFORMS ?=
ifneq ($(strip $(DOCKER_BUILDX_PLATFORMS)),)
DOCKER_BUILD_CMD ?= docker buildx build --push --platform $(DOCKER_BUILDX_PLATFORMS)
else
DOCKER_BUILD_CMD ?= docker build
endif
MAKEFILE = $(firstword $(MAKEFILE_LIST))
MAKEFILE_DIR = $(shell cd $(dir $(MAKEFILE)) && pwd)
AWS_REGIONS = $(shell aws ec2 describe-regions \
--filter "Name=opt-in-status,Values=opt-in-not-required" \
--output json --query 'Regions[].RegionName[]' \
| tr -d '[[:space:]]')
build:
DOCKER_BUILDKIT=1 docker $@ \
DOCKER_BUILDKIT=1 $(DOCKER_BUILD_CMD) \
--no-cache \
--build-arg TW_VERSION=$(TW_VERSION) \
--build-arg BASE_IMAGE=$(BASE_IMAGE) \
--build-arg USER=$(USER) \
-f Dockerfile \
-f $(DOCKERFILE) \
$(addprefix -t ,$(IMAGE_TAGS)) \
$(MAKEFILE_DIR)
push:
for t in $(IMAGE_TAGS) ; do docker $@ $$t ; done
release:
$(MAKE) -f $(MAKEFILE) build DOCKER_BUILDX_PLATFORMS=linux/arm64,linux/amd64
ami:
packer init -upgrade .
packer build -var ami_regions='[$(AWS_REGIONS)]' .
......
......@@ -5,7 +5,7 @@
## Supported Tags
* `5.3.6`, `5.3.6-node20.18-alpine3.19`, `latest`
* `5.3.6`, `5.3.6-node23.3-alpine3.19`, `latest`
* `5.2.2`, `5.2.2-node17.9-alpine3.15`
* `5.2.0`, `5.2.0-node17.0-alpine3.13`
* `5.1.23`, `5.1.23-node14.18.1-alpine3.14`
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment