Skip to content

feat: bump alpine to 3.22 and go to 1.24 [RL-342] #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sylwit wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: bump alpine to 3.22 and go to 1.24 [RL-342] #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
ARG BASE_VARIANT=alpine
ARG GO_VERSION=1.19
ARG XX_VERSION=1.1.2
ARG GO_VERSION=1.24
ARG XX_VERSION=1.6.1

FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx

FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-${BASE_VARIANT} as gostable
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-${BASE_VARIANT} AS gostable

FROM gostable AS go-linux

Expand All @@ -17,7 +17,7 @@ RUN apk add --no-cache clang lld
COPY --from=xx / /

# build-go-mod can still be cached at build platform architecture.
FROM build-base as build
FROM build-base AS build

ARG TARGETPLATFORM

Expand Down Expand Up @@ -61,7 +61,7 @@ RUN export CGO_LDFLAGS="-static -fuse-ld=lld" && \
# Ensure that the binary was cross-compiled correctly to the target platform.
RUN xx-verify --static /source-controller

FROM alpine:3.17
FROM alpine:3.22

ARG TARGETPLATFORM
RUN apk --no-cache add ca-certificates \
Expand Down
7 changes: 4 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ SKIP_COSIGN_VERIFICATION ?= false
# e.g. '--push'.
BUILD_ARGS ?=
# Architectures to build images for
BUILD_PLATFORMS ?= linux/amd64,linux/arm64,linux/arm/v7
BUILD_PLATFORMS ?= linux/amd64 #,linux/arm64,linux/arm/v7

# Go additional tag arguments, e.g. 'integration',
# this is append to the tag arguments required for static builds
Expand Down Expand Up @@ -137,11 +137,12 @@ generate: controller-gen ## Generate API code
docker-build: ## Build the Docker image
docker buildx build \
--platform=$(BUILD_PLATFORMS) \
-t $(IMG):$(TAG) \
--load \
-t $(IMG) \
$(BUILD_ARGS) .

docker-push: ## Push Docker image
docker push $(IMG):$(TAG)
docker push $(IMG)

# Find or download controller-gen
CONTROLLER_GEN = $(GOBIN)/controller-gen
Expand Down
10 changes: 10 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@
[![license](https://img.shields.io/github/license/fluxcd/source-controller.svg)](https://github.com/fluxcd/source-controller/blob/main/LICENSE)
[![release](https://img.shields.io/github/release/fluxcd/source-controller/all.svg)](https://github.com/fluxcd/source-controller/releases)

## VGS fork

```
today=$(date +%Y%m%d)
export IMG="190066226418.dkr.ecr.us-east-1.amazonaws.com/infra/source-controller:v0.34.0-$today"
make docker-build
assume presidio/infra
make docker-push
```

The source-controller is a Kubernetes operator, specialised in artifacts acquisition
from external sources such as Git, Helm repositories and S3 buckets.
The source-controller implements the
Expand Down