diff --git a/.github/workflows/fluxcd-images.yaml b/.github/workflows/fluxcd-images.yaml index fc5d105..07b00c3 100644 --- a/.github/workflows/fluxcd-images.yaml +++ b/.github/workflows/fluxcd-images.yaml @@ -32,7 +32,7 @@ jobs: password: ${{ secrets.HELM_REPO_PASSWORD }} path: './oci/base/alpine' build_file: 'Dockerfile' - image: public/alpine-ca + image: public/alpine tag: latest cache: true cache_registry: cache @@ -69,7 +69,7 @@ jobs: password: ${{ secrets.HELM_REPO_PASSWORD }} path: oci/fluxcd/flux-helm-controller/ image: public/fluxcd/helm-controller - tag: v0.22.1 + tag: v0.31.1 cache: true cache_registry: cache fluxcd-image-automation-controller: @@ -87,7 +87,7 @@ jobs: password: ${{ secrets.HELM_REPO_PASSWORD }} path: oci/fluxcd/flux-image-automation-controller/ image: public/fluxcd/image-automation-controller - tag: v0.23.4 + tag: v0.31.0 cache: true cache_registry: cache flux-image-reflector-controller: @@ -105,7 +105,7 @@ jobs: password: ${{ secrets.HELM_REPO_PASSWORD }} path: oci/fluxcd/flux-image-reflector-controller/ image: public/fluxcd/image-reflector-controller - tag: v0.19.2 + tag: v0.26.0 cache: true cache_registry: cache flux-kustomize-controller: @@ -123,7 +123,7 @@ jobs: password: ${{ secrets.HELM_REPO_PASSWORD }} path: 'oci/fluxcd/flux-kustomize-controller/' image: public/fluxcd/kustomize-controller - tag: v0.26.2 + tag: v0.35.0 cache: true cache_registry: cache flux-notification-controller: @@ -141,7 +141,7 @@ jobs: password: ${{ secrets.HELM_REPO_PASSWORD }} path: oci/fluxcd/flux-notification-controller/ image: public/fluxcd/notification-controller - tag: v0.24.0 + tag: v0.33.0 cache: true cache_registry: cache flux-source-controller: @@ -159,6 +159,6 @@ jobs: password: ${{ secrets.HELM_REPO_PASSWORD }} path: oci/fluxcd/flux-source-controller/ image: public/fluxcd/source-controller - tag: v0.25.9 + tag: v0.36.0 cache: true cache_registry: cache diff --git a/.github/workflows/sync-fluxcd-images.yaml b/.github/workflows/sync-fluxcd-images.yaml deleted file mode 100644 index 61bb672..0000000 --- a/.github/workflows/sync-fluxcd-images.yaml +++ /dev/null @@ -1,47 +0,0 @@ -name: Sync Images - -on: - pull_request: - push: - paths: - - '.github/workflows/sync-fluxcd-images.yaml' - branches: - - main - -env: - TZ: Asia/Shanghai - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@main - with: - ref: ${{ github.head_ref }} - - - name: Initialization environment - env: - REPO_PASSWORD: ${{ secrets.HELM_REPO_PASSWORD }} - shell: bash - run: | - sudo apt update - sudo apt install git -y - sudo timedatectl set-timezone "$TZ" - echo "$REPO_PASSWORD" | docker login --username=admin --password-stdin artifact.onwalk.net - - - name: Sync images - shell: bash - run: | - LIST="helm-controller:v0.31.1 \ - image-automation-controller:v0.31.0 \ - source-controller:v0.36.0 \ - notification-controller:v0.33.0 \ - kustomize-controller:v0.35.0 \ - image-reflector-controller:v0.26.0" - for IMG in $LIST - do - docker pull gcr.io/fluxcd/$IMG - docker tag gcr.io/fluxcd/$IMG artifact.onwalk.net/fluxcd/$IMG - docker push artifact.onwalk.net/public/fluxcd/$IMG - done diff --git a/oci/fluxcd/flux-helm-controller/Dockerfile b/oci/fluxcd/flux-helm-controller/Dockerfile index 14c971e..0a3b7b7 100644 --- a/oci/fluxcd/flux-helm-controller/Dockerfile +++ b/oci/fluxcd/flux-helm-controller/Dockerfile @@ -1,6 +1,6 @@ -FROM ghcr.io/fluxcd/helm-controller:v0.22.1 as build +FROM ghcr.io/fluxcd/helm-controller:v0.31.1 as build -FROM artifact.onwalk.net/public/alpine-ca:latest as prod +FROM artifact.onwalk.net/public/alpine:latest as prod LABEL org.opencontainers.image.source="https://github.com/fluxcd/helm-controller" RUN apk add --no-cache ca-certificates tini COPY --from=build /usr/local/bin/helm-controller /usr/local/bin/ diff --git a/oci/fluxcd/flux-image-automation-controller/Dockerfile b/oci/fluxcd/flux-image-automation-controller/Dockerfile index 7399312..fe0e700 100644 --- a/oci/fluxcd/flux-image-automation-controller/Dockerfile +++ b/oci/fluxcd/flux-image-automation-controller/Dockerfile @@ -1,6 +1,6 @@ -FROM ghcr.io/fluxcd/image-automation-controller:v0.23.4 as build +FROM ghcr.io/fluxcd/image-automation-controller:v0.31.0 as build -FROM artifact.onwalk.net/public/alpine-ca:latest as prod +FROM artifact.onwalk.net/public/alpine:latest as prod COPY --from=build /usr/local/bin/image-automation-controller /usr/local/bin/ USER 65534:65534 diff --git a/oci/fluxcd/flux-image-reflector-controller/Dockerfile b/oci/fluxcd/flux-image-reflector-controller/Dockerfile index 6f7b290..df4d8e8 100644 --- a/oci/fluxcd/flux-image-reflector-controller/Dockerfile +++ b/oci/fluxcd/flux-image-reflector-controller/Dockerfile @@ -1,6 +1,6 @@ -FROM ghcr.io/fluxcd/image-reflector-controller:v0.19.2 as build +FROM ghcr.io/fluxcd/image-reflector-controller:v0.26.0 as build -FROM artifact.onwalk.net/public/alpine-ca:latest as prod +FROM artifact.onwalk.net/public/alpine:latest as prod RUN apk add --no-cache ca-certificates tini COPY --from=build /usr/local/bin/image-reflector-controller /usr/local/bin/ diff --git a/oci/fluxcd/flux-kustomize-controller/Dockerfile b/oci/fluxcd/flux-kustomize-controller/Dockerfile index 0dedc8b..35cc428 100644 --- a/oci/fluxcd/flux-kustomize-controller/Dockerfile +++ b/oci/fluxcd/flux-kustomize-controller/Dockerfile @@ -1,6 +1,6 @@ -FROM ghcr.io/fluxcd/kustomize-controller:v0.26.2 as build +FROM ghcr.io/fluxcd/kustomize-controller:v0.35.0 as build -FROM artifact.onwalk.net/public/alpine-ca:latest as prod +FROM artifact.onwalk.net/public/alpine:latest as prod RUN apk add --no-cache ca-certificates tini git openssh-client && apk add --no-cache gnupg --repository=https://dl-cdn.alpinelinux.org/alpine/edge/main diff --git a/oci/fluxcd/flux-notification-controller/Dockerfile b/oci/fluxcd/flux-notification-controller/Dockerfile index 19195a0..ad88685 100644 --- a/oci/fluxcd/flux-notification-controller/Dockerfile +++ b/oci/fluxcd/flux-notification-controller/Dockerfile @@ -1,6 +1,6 @@ -FROM ghcr.io/fluxcd/notification-controller:v0.24.0 as build +FROM ghcr.io/fluxcd/notification-controller:v0.33.0 as build -FROM artifact.onwalk.net/public/alpine-ca:latest as prod +FROM artifact.onwalk.net/public/alpine:latest as prod LABEL org.opencontainers.image.source="https://github.com/fluxcd/notification-controller" RUN apk add --no-cache ca-certificates tini diff --git a/oci/fluxcd/flux-source-controller/Dockerfile b/oci/fluxcd/flux-source-controller/Dockerfile index 9bf6a8c..9107c1a 100644 --- a/oci/fluxcd/flux-source-controller/Dockerfile +++ b/oci/fluxcd/flux-source-controller/Dockerfile @@ -1,6 +1,6 @@ -FROM ghcr.io/fluxcd/source-controller:v0.25.9 as build +FROM ghcr.io/fluxcd/source-controller:v0.36.0 as build -FROM artifact.onwalk.net/public/alpine-ca:latest as prod +FROM artifact.onwalk.net/public/alpine:latest as prod ARG TARGETPLATFORM RUN apk --no-cache add ca-certificates && update-ca-certificates