Skip to content
GitLab
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Primary navigation
Search or go to…
Project
tiddlywiki
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Privacy statement
Keyboard shortcuts
?
What's new
4
Snippets
Groups
Projects
Show more breadcrumbs
Nicola Worthington
tiddlywiki
Commits
d2c87e5c
Commit
d2c87e5c
authored
2 months ago
by
Nicola Worthington
Browse files
Options
Downloads
Plain Diff
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
!21
Reduced architectures for manual build
Pipeline
#1693629173
failed
4 hours ago
Stage: test
Stage: build
Stage: scan
Changes
4
Pipelines
14
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
Dockerfile
+1
-1
1 addition, 1 deletion
Dockerfile
Makefile
+18
-4
18 additions, 4 deletions
Makefile
README.md
+1
-1
1 addition, 1 deletion
README.md
with
21 additions
and
7 deletions
.gitlab-ci.yml
+
1
−
1
View file @
d2c87e5c
...
...
@@ -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"
-
>
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
1
−
1
View file @
d2c87e5c
...
...
@@ -7,7 +7,7 @@
# https://nicolaw.uk/#TiddlyWiki
#
ARG
BASE_IMAGE=node:2
0.18
-alpine3.19
ARG
BASE_IMAGE=node:2
3.3
-alpine3.19
FROM
${BASE_IMAGE}
AS
build
ARG
TW_VERSION=5.3.6
...
...
This diff is collapsed.
Click to expand it.
Makefile
+
18
−
4
View file @
d2c87e5c
...
...
@@ -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:2
0.18
-alpine3.19
BASE_IMAGE
=
node:2
3.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
)
]'
.
...
...
This diff is collapsed.
Click to expand it.
README.md
+
1
−
1
View file @
d2c87e5c
...
...
@@ -5,7 +5,7 @@
## Supported Tags
*
`5.3.6`
,
`5.3.6-node2
0.18
-alpine3.19`
,
`latest`
*
`5.3.6`
,
`5.3.6-node2
3.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`
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment