8000 Add a k3s sample image by EmeraldShift · Pull Request #739 · weaveworks/ignite · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Dec 7, 2023. It is now read-only.

Add a k3s sample image #739

Merged
merged 5 commits into from
Nov 30, 2020
Merged

Add a k3s sample image #739

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6905060
Add a k3s sample image
EmeraldShift Nov 26, 2020
6320b18
make autogen tidy
EmeraldShift Nov 27, 2020
1bbf55c
Allow + in tags, bump k3s version
EmeraldShift Nov 29, 2020
534815a
Add simple k3s image README
EmeraldShift Nov 29, 2020
e4ee324
Merge branch 'master' of https://github.com/weaveworks/ignite
EmeraldShift Nov 29, 2020
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
Prev Previous commit
Next Next commit
Allow + in tags, bump k3s version
  • Loading branch information
@EmeraldShift
EmeraldShift committed Nov 29, 2020
commit 1bbf55ccf4e265b619215512b2f3dbb3f4537674
7 changes: 4 additions & 3 deletions images/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,15 @@ DOCKER_USER?=weaveworks
VERSION?=$(shell git describe HEAD --tags)
RELEASE?=latest
FULL_IMAGE_NAME=${DOCKER_USER}/ignite-${WHAT}:${TAG}
RELEASE_IMAGE_NAME=${DOCKER_USER}/ignite-${WHAT}:${RELEASE}
escaped_RELEASE:=$(subst +,-,$(RELEASE))
RELEASE_IMAGE_NAME=${DOCKER_USER}/ignite-${WHAT}:${escaped_RELEASE}
LATEST_IMAGE_NAME=${DOCKER_USER}/ignite-${WHAT}:latest

GOARCH?=amd64
GOARCH_LIST=amd64 arm64
# Set this flag to build a multiarch image
IS_MANIFEST_LIST?=0
TAG:=${RELEASE}$(if $(strip $(VERSION)),-${VERSION})
TAG:=${escaped_RELEASE}$(if $(strip $(VERSION)),-${VERSION})
OP:=build

TMPDIR?=/tmp
Expand Down Expand Up @@ -162,7 +163,7 @@ build-centos:
$(MAKE) ${OP} WHAT=centos RELEASE=8 IS_LATEST=true

build-k3s:
$(MAK 4B20 E) ${OP} WHAT=k3s RELEASE=v1.0.1 IS_LATEST=true
$(MAKE) ${OP} WHAT=k3s RELEASE=v1.19.4+k3s1 IS_LATEST=true

build-kubeadm:
$(MAKE) ${OP} WHAT=kubeadm RELEASE=v1.18.3 BINARY_REF=release/stable-1.18 IS_LATEST=true IS_MANIFEST_LIST=1 GOARCH=arm64
Expand Down
0