Skip to content

Commit

Permalink
Merge branch 'main-apptweak' into misc/davida/add-kubectl-rollout-option
Browse files Browse the repository at this point in the history
Conflicts:
	Dockerfile
	Makefile
  • Loading branch information
Dakad committed Oct 29, 2024
2 parents 7b55075 + 38cc7b8 commit ff2f6f1
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ FROM alpine/helm:3.14.0
FROM --platform=linux/amd64 alpine/helm:3.10.2
# Helm supported version along with K8 version: https://helm.sh/docs/topics/version_skew/

LABEL org.opencontainers.image.source https://github.com/apptweak/concourse-helm3-resource

# Versions for gcloud, kubectl, doctl, awscli
# K8 versions: https://kubernetes.io/releases/
ARG KUBERNETES_VERSION=1.28.5
Expand Down
12 changes: 8 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
PROJECT = helm3-resource
ID = apptweakci/${PROJECT}
PROJECT = concourse-helm3-resource
ID = apptweak/${PROJECT}
ECR_REPO = ghcr.io
TAG_VERSION := v$(shell cat VERSION)

all: build push

build:
docker build --platform linux/x86_64 --tag ${ID}:${TAG_VERSION} .
docker build --platform linux/x86_64 --tag ${ECR_REPO}/${ID}:${TAG_VERSION} .

push:
# read --local --silent --prompt "Docker account's password: " passwd
# echo "$passwd" | docker login --username apptweakci --password-stdin
docker push ${ID}:${TAG_VERSION}
read --local --silent --prompt "Docker account's password: " gh_pat
echo "${gh_pat}"
# echo "${gh_pat}" | docker login "${ECR_REPO}" --username apptweakci --password-stdin
# docker push ${ECR_REPO}/${ID}:${TAG_VERSION}

run:
docker run \
Expand Down

0 comments on commit ff2f6f1

Please sign in to comment.