diff --git a/.github/workflows/build-and-publish.yaml b/.github/workflows/build-and-publish.yaml index 039811e9..ef900fd8 100644 --- a/.github/workflows/build-and-publish.yaml +++ b/.github/workflows/build-and-publish.yaml @@ -10,7 +10,7 @@ permissions: env: CONTROLLER: ${{ github.event.repository.name }} - LIBCRYTO_VERSION: "3.1.3-r0" + LIBCRYPTO_VERSION: "3.1.3-r0" jobs: test: @@ -74,7 +74,7 @@ jobs: context: . file: ./Dockerfile build-args: | - LIBCRYTO_VERSION=${{ env.LIBCRYTO_VERSION }} + LIBCRYPTO_VERSION=${{ env.LIBCRYPTO_VERSION }} platforms: linux/amd64,linux/arm64 #,linux/arm/v7 tags: | ghcr.io/weaveworks/${{ env.CONTROLLER }}:${{ steps.prep.outputs.VERSION }} @@ -93,7 +93,7 @@ jobs: context: . file: ./runner-base.Dockerfile build-args: | - LIBCRYTO_VERSION=${{ env.LIBCRYTO_VERSION }} + LIBCRYPTO_VERSION=${{ env.LIBCRYPTO_VERSION }} platforms: linux/amd64,linux/arm64 #,linux/arm/v7 tags: | ghcr.io/weaveworks/tf-runner:${{ steps.prep.outputs.VERSION }}-base @@ -132,7 +132,7 @@ jobs: file: ./planner.Dockerfile platforms: linux/amd64,linux/arm64 #,linux/arm/v7 build-args: | - LIBCRYTO_VERSION=${{ env.LIBCRYTO_VERSION }} + LIBCRYPTO_VERSION=${{ env.LIBCRYPTO_VERSION }} tags: | ghcr.io/weaveworks/branch-planner:${{ steps.prep.outputs.VERSION }} labels: | diff --git a/.github/workflows/release-runners.yaml b/.github/workflows/release-runners.yaml index fd936fdd..45395e1e 100644 --- a/.github/workflows/release-runners.yaml +++ b/.github/workflows/release-runners.yaml @@ -18,7 +18,7 @@ permissions: env: VERSION: ${{ github.event.inputs.version }} BUILD_DATE: ${{ github.event.inputs.build_date }} - LIBCRYTO_VERSION: "3.1.3-r0" + LIBCRYPTO_VERSION: "3.1.3-r0" jobs: release-base: @@ -54,7 +54,7 @@ jobs: context: . file: ./runner-base.Dockerfile build-args: | - LIBCRYTO_VERSION=${{ env.LIBCRYTO_VERSION }} + LIBCRYPTO_VERSION=${{ env.LIBCRYPTO_VERSION }} platforms: linux/amd64,linux/arm64 #,linux/arm/v7 tags: | ghcr.io/weaveworks/tf-runner:${{ env.VERSION }}-base @@ -106,7 +106,7 @@ jobs: build-args: | BASE_IMAGE=ghcr.io/weaveworks/tf-runner:${{ env.VERSION }}-base TF_VERSION=${{ matrix.tf_version }} - LIBCRYTO_VERSION=${{ env.LIBCRYTO_VERSION }} + LIBCRYPTO_VERSION=${{ env.LIBCRYPTO_VERSION }} tags: | ghcr.io/weaveworks/tf-runner:${{ env.VERSION }}-tf-${{ matrix.tf_version }} labels: | diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 74f75236..80643ccb 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -12,7 +12,7 @@ on: permissions: contents: read # for actions/checkout to fetch code - LIBCRYTO_VERSION: "3.1.3-r0" + LIBCRYPTO_VERSION: "3.1.3-r0" env: CONTROLLER: ${{ github.event.repository.name }} @@ -70,7 +70,7 @@ jobs: context: . file: ./Dockerfile build-args: | - LIBCRYTO_VERSION=${{ env.LIBCRYTO_VERSION }} + LIBCRYPTO_VERSION=${{ env.LIBCRYPTO_VERSION }} platforms: linux/amd64,linux/arm64 #,linux/arm/v7 tags: | ghcr.io/weaveworks/${{ env.CONTROLLER }}:${{ steps.prep.outputs.VERSION }} @@ -90,7 +90,7 @@ jobs: context: . file: ./runner-base.Dockerfile build-args: | - LIBCRYTO_VERSION=${{ env.LIBCRYTO_VERSION }} + LIBCRYPTO_VERSION=${{ env.LIBCRYPTO_VERSION }} platforms: linux/amd64,linux/arm64 #,linux/arm/v7 tags: | ghcr.io/weaveworks/tf-runner:${{ steps.prep.outputs.VERSION }}-base @@ -152,7 +152,7 @@ jobs: context: . file: ./planner.Dockerfile build-args: | - LIBCRYTO_VERSION=${{ env.LIBCRYTO_VERSION }} + LIBCRYPTO_VERSION=${{ env.LIBCRYPTO_VERSION }} platforms: linux/amd64,linux/arm64 #,linux/arm/v7 - azure-cli does not install correctly on 32 bit arm tags: | ghcr.io/weaveworks/branch-planner:${{ steps.prep.outputs.VERSION }} diff --git a/Dockerfile b/Dockerfile index 017a7eff..d7de534c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,12 +37,12 @@ FROM alpine:3.18 LABEL org.opencontainers.image.source="https://github.com/weaveworks/tf-controller" -ARG LIBCRYTO_VERSION +ARG LIBCRYPTO_VERSION RUN apk update && \ apk add --no-cache \ - libcrypto3=${LIBCRYTO_VERSION} \ - libssl3=${LIBCRYTO_VERSION} \ + libcrypto3=${LIBCRYPTO_VERSION} \ + libssl3=${LIBCRYPTO_VERSION} \ ca-certificates tini git openssh-client gnupg \ libretls \ busybox diff --git a/Makefile b/Makefile index 34de523b..c44984d0 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ BUILD_VERSION ?= $(shell git describe --tags $$(git rev-list --tags --max-count= # - .github/workflows/release-runners.yaml # - .github/workflows/release.yaml # - Tiltfile -LIBCRYTO_VERSION ?= 3.1.3-r0 +LIBCRYPTO_VERSION ?= 3.1.3-r0 # source controller version SOURCE_VER ?= v1.0.0-rc.1 @@ -146,19 +146,19 @@ run-planner: manifests generate fmt vet ## Run a branch planner from your host. .PHONY: docker-build docker-build: ## Build docker - docker build -t ${MANAGER_IMG}:${TAG} --build-arg LIBCRYTO_VERSION=${LIBCRYTO_VERSION} ${BUILD_ARGS} . - docker build -t ${RUNNER_IMG}:${TAG}-base -f runner-base.Dockerfile --build-arg LIBCRYTO_VERSION=${LIBCRYTO_VERSION} ${BUILD_ARGS} . + docker build -t ${MANAGER_IMG}:${TAG} --build-arg LIBCRYPTO_VERSION=${LIBCRYPTO_VERSION} ${BUILD_ARGS} . + docker build -t ${RUNNER_IMG}:${TAG}-base -f runner-base.Dockerfile --build-arg LIBCRYPTO_VERSION=${LIBCRYPTO_VERSION} ${BUILD_ARGS} . docker build -t ${RUNNER_IMG}:${TAG} -f runner.Dockerfile --build-arg BASE_IMAGE=${RUNNER_IMG}:${TAG}-base ${BUILD_ARGS} . docker build -t ${RUNNER_AZURE_IMAGE}:${TAG} -f runner-azure.Dockerfile --build-arg BASE_IMAGE=${RUNNER_IMG}:${TAG}-base ${BUILD_ARGS} . - docker build -t ${BRANCH_PLANNER_IMAGE}:${TAG} -f planner.Dockerfile --build-arg LIBCRYTO_VERSION=${LIBCRYTO_VERSION} ${BUILD_ARGS} . + docker build -t ${BRANCH_PLANNER_IMAGE}:${TAG} -f planner.Dockerfile --build-arg LIBCRYPTO_VERSION=${LIBCRYPTO_VERSION} ${BUILD_ARGS} . .PHONY: docker-buildx docker-buildx: ## Build docker - docker buildx build --load -t ${MANAGER_IMG}:${TAG} --build-arg LIBCRYTO_VERSION=${LIBCRYTO_VERSION} ${BUILD_ARGS} . - docker buildx build --load -t ${RUNNER_IMG}:${TAG}-base -f runner-base.Dockerfile --build-arg LIBCRYTO_VERSION=${LIBCRYTO_VERSION} ${BUILD_ARGS} . + docker buildx build --load -t ${MANAGER_IMG}:${TAG} --build-arg LIBCRYPTO_VERSION=${LIBCRYPTO_VERSION} ${BUILD_ARGS} . + docker buildx build --load -t ${RUNNER_IMG}:${TAG}-base -f runner-base.Dockerfile --build-arg LIBCRYPTO_VERSION=${LIBCRYPTO_VERSION} ${BUILD_ARGS} . docker buildx build --load -t ${RUNNER_IMG}:${TAG} -f runner.Dockerfile --build-arg BASE_IMAGE=${RUNNER_IMG}:${TAG}-base ${BUILD_ARGS} . docker buildx build --load -t ${RUNNER_AZURE_IMAGE}:${TAG} -f runner-azure.Dockerfile --build-arg BASE_IMAGE=${RUNNER_IMG}:${TAG}-base ${BUILD_ARGS} . - docker buildx build --load -t ${BRANCH_PLANNER_IMAGE}:${TAG} -f planner.Dockerfile --build-arg LIBCRYTO_VERSION=${LIBCRYTO_VERSION} ${BUILD_ARGS} . + docker buildx build --load -t ${BRANCH_PLANNER_IMAGE}:${TAG} -f planner.Dockerfile --build-arg LIBCRYPTO_VERSION=${LIBCRYPTO_VERSION} ${BUILD_ARGS} . .PHONY: docker-push docker-push: ## Push docker image with the manager. @@ -169,7 +169,7 @@ docker-push: ## Push docker image with the manager. docker push ${BRANCH_PLANNER_IMAGE}:${TAG} docker-dev-runner: - docker buildx build --load -t ${RUNNER_IMG}:${TAG}-base -f runner-base.Dockerfile --build-arg LIBCRYTO_VERSION=${LIBCRYTO_VERSION} ${BUILD_ARGS} . + docker buildx build --load -t ${RUNNER_IMG}:${TAG}-base -f runner-base.Dockerfile --build-arg LIBCRYPTO_VERSION=${LIBCRYPTO_VERSION} ${BUILD_ARGS} . docker buildx build --load -t ${RUNNER_IMG}:${TAG} -f runner.Dockerfile --build-arg BASE_IMAGE=${RUNNER_IMG}:${TAG}-base ${BUILD_ARGS} . docker push ${RUNNER_IMG}:${TAG} diff --git a/Tiltfile b/Tiltfile index cbf9b5c9..5cf902e1 100644 --- a/Tiltfile +++ b/Tiltfile @@ -8,7 +8,7 @@ tfNamespace = "terraform" buildSHA = str(local('git rev-parse --short HEAD')).rstrip('\n') buildVersionRef = str(local('git rev-list --tags --max-count=1')).rstrip('\n') buildVersion = str(local("git describe --tags ${buildVersionRef}")).rstrip('\n') -LIBCRYTO_VERSION = "3.1.3-r0" +LIBCRYPTO_VERSION = "3.1.3-r0" if os.path.exists('Tiltfile.local'): include('Tiltfile.local') @@ -66,7 +66,7 @@ docker_build( build_args={ 'BUILD_SHA': buildSHA, 'BUILD_VERSION': buildVersion, - 'LIBCRYTO_VERSION': LIBCRYTO_VERSION, + 'LIBCRYPTO_VERSION': LIBCRYPTO_VERSION, }) docker_build( @@ -76,7 +76,7 @@ docker_build( build_args={ 'BUILD_SHA': buildSHA, 'BUILD_VERSION': buildVersion, - 'LIBCRYTO_VERSION': LIBCRYTO_VERSION, + 'LIBCRYPTO_VERSION': LIBCRYPTO_VERSION, }) # There are no resources using this image when tilt starts, but we still need @@ -89,5 +89,5 @@ docker_build( build_args={ 'BUILD_SHA': buildSHA, 'BUILD_VERSION': buildVersion, - 'LIBCRYTO_VERSION': LIBCRYTO_VERSION, + 'LIBCRYPTO_VERSION': LIBCRYPTO_VERSION, }) diff --git a/planner.Dockerfile b/planner.Dockerfile index c5a6a76e..848ab5b1 100644 --- a/planner.Dockerfile +++ b/planner.Dockerfile @@ -39,12 +39,12 @@ FROM alpine:3.18 LABEL org.opencontainers.image.source="https://github.com/weaveworks/tf-controller" -ARG LIBCRYTO_VERSION +ARG LIBCRYPTO_VERSION RUN apk update && \ apk add --no-cache \ - libcrypto3=${LIBCRYTO_VERSION} \ - libssl3=${LIBCRYTO_VERSION} \ + libcrypto3=${LIBCRYPTO_VERSION} \ + libssl3=${LIBCRYPTO_VERSION} \ ca-certificates tini git openssh-client gnupg \ libretls \ busybox diff --git a/runner-base.Dockerfile b/runner-base.Dockerfile index 4a5e223c..1cd0b8ec 100644 --- a/runner-base.Dockerfile +++ b/runner-base.Dockerfile @@ -33,7 +33,7 @@ FROM alpine:3.18 LABEL org.opencontainers.image.source="https://github.com/weaveworks/tf-controller" -ARG LIBCRYTO_VERSION +ARG LIBCRYPTO_VERSION RUN apk update && \ apk add --no-cache \ @@ -41,8 +41,8 @@ RUN apk update && \ ca-certificates \ git \ gnupg \ - libcrypto3=${LIBCRYTO_VERSION} \ - libssl3=${LIBCRYTO_VERSION} \ + libcrypto3=${LIBCRYPTO_VERSION} \ + libssl3=${LIBCRYPTO_VERSION} \ libretls \ openssh-client \ tini