Upgrade libcrypto to 3.3.2-r4 and alpine to 3.21

flux-iac · Jan 13, 2025 · 74ddf69 · 74ddf69
1 parent 961c767
commit 74ddf69
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git 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 }}
-  LIBCRYPTO_VERSION: "3.3.2-r0"
+  LIBCRYPTO_VERSION: "3.3.2-r4"
 
 jobs:
   test:

diff --git 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 }}
-  LIBCRYPTO_VERSION: "3.3.2-r0"
+  LIBCRYPTO_VERSION: "3.3.2-r4"
 
 jobs:
   release-base:

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -15,7 +15,7 @@ permissions:
 
 env:
   CONTROLLER: ${{ github.event.repository.name }}
-  LIBCRYPTO_VERSION: "3.3.2-r0"
+  LIBCRYPTO_VERSION: "3.3.2-r4"
 
 jobs:
   build-push:

diff --git a/Dockerfile b/Dockerfile
@@ -34,7 +34,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
         -ldflags "-X main.BuildSHA='${BUILD_SHA}' -X main.BuildVersion='${BUILD_VERSION}'" \
         -a -o tofu-controller ./cmd/manager
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 LABEL org.opencontainers.image.source="https://github.com/flux-iac/tofu-controller"
 

diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM alpine:3.20
+FROM alpine:3.21
 
 LABEL org.opencontainers.image.source="https://github.com/flux-iac/tofu-controller"
 

diff --git 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
-LIBCRYPTO_VERSION ?= 3.3.2-r0
+LIBCRYPTO_VERSION ?= 3.3.2-r4
 
 # source controller version
 SOURCE_VER ?= v1.0.0-rc.1

diff --git 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')
-LIBCRYPTO_VERSION = "3.3.2-r0"
+LIBCRYPTO_VERSION = "3.3.2-r4"
 
 if os.path.exists('Tiltfile.local'):
    include('Tiltfile.local')

diff --git a/planner.Dockerfile b/planner.Dockerfile
@@ -35,7 +35,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
       -o branch-planner \
       ./cmd/branch-planner
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 LABEL org.opencontainers.image.source="https://github.com/flux-iac/tofu-controller"
 

diff --git a/planner.Dockerfile.dev b/planner.Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM alpine:3.20
+FROM alpine:3.21
 
 LABEL org.opencontainers.image.source="https://github.com/flux-iac/tofu-controller"
 

diff --git a/runner-base.Dockerfile b/runner-base.Dockerfile
@@ -38,7 +38,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
         -o tf-runner \
         ./cmd/runner/main.go
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 LABEL org.opencontainers.image.source="https://github.com/flux-iac/tofu-controller"
 

diff --git a/runner.Dockerfile.dev b/runner.Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM alpine:3.20 as base
+FROM alpine:3.21 as base
 
 LABEL org.opencontainers.image.source="https://github.com/flux-iac/tofu-controller"
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ permissions: @@
     env:
       CONTROLLER: ${{ github.event.repository.name }}
-      LIBCRYPTO_VERSION: "3.3.2-r0"
+      LIBCRYPTO_VERSION: "3.3.2-r4"
     jobs:
       test:
@@ Expand Down @@