Merge pull request #2 from nosinovacao/22.04.0

Updated kubectl and fluxctl versions and changed location to ghcr
nosinovacao · Apr 5, 2022 · 0ba5699 · 0ba5699
2 parents 286e45f + 140f3a1
commit 0ba5699
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,9 @@
 # alpine based
-FROM lachlanevenson/k8s-kubectl:v1.17.17
+FROM lachlanevenson/k8s-kubectl:v1.21.10
 
 LABEL maintainer="NOS Inovação S.A. <[email protected]>"
 
-ENV FLUX_LATEST_VERSION="1.20.2"
+ENV FLUX_LATEST_VERSION="1.24.3"
 
 RUN apk add --update ca-certificates \
  && apk add --update -t deps curl \

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 default: docker_build
 
-DOCKER_IMAGE ?= nosinovacao/fluxctl
+DOCKER_IMAGE ?= ghcr.io/nosinovacao/fluxctl
 GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
 
 ifeq ($(GIT_BRANCH), master)
@@ -12,7 +12,6 @@ endif
 docker_build:
 	@docker build \
 	  -t $(DOCKER_IMAGE):$(DOCKER_TAG) .
-
 docker_push:
 	# Push to DockerHub
 	docker push $(DOCKER_IMAGE):$(DOCKER_TAG)

diff --git a/README.md b/README.md
@@ -14,4 +14,4 @@ For more information regarding Flux, please visit <https://github.com/weaveworks
 
 ## Run
 
-`docker run --rm nosinovacao/fluxctl:latest --help`
+`docker run --rm ghcr.io/nosinovacao/fluxctl:latest --help`