Skip to content

Commit

Permalink
Rework patching process
Browse files Browse the repository at this point in the history
  • Loading branch information
jjaniec committed Nov 22, 2023
1 parent 3c10c4e commit dee5234
Show file tree
Hide file tree
Showing 9 changed files with 359 additions and 118 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/patch-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- uses: actions/checkout@v2

- name: Build and push latest
run: make patch-images
run: cd patching && ./patch-images.sh
env:
DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
DOCKERHUB_PASS: ${{ secrets.DOCKERHUB_PASS }}
Expand Down
6 changes: 0 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,17 @@ argocd-helm-secrets-sops:
cd src/argocd-helm-secrets-sops && ./build-latest.sh "${REPOSITORY_ROOT}/argocd-helm-secrets-sops"
argocd-helm-secrets-sops-tests:
./tests/argocd-helm-secrets-sops/check_path.sh "jjaniec/argocd-helm-secrets-sops:latest"
argocd-helm-secrets-sops-patch:
./patch-images.sh src/argocd-helm-secrets-sops jjaniec/argocd-helm-secrets-sops argocd-helm-secrets-sops-tests

asdf:
cd src/asdf && ./build-latest.sh "${REPOSITORY_ROOT}/asdf"
asdf-tests:
./tests/asdf/check_path.sh "jjaniec/asdf:latest"
asdf-patch:
./patch-images.sh src/asdf jjaniec/asdf asdf-tests

airflow-exporter:
cd src/airflow-exporter && ./build-latest.sh "${REPOSITORY_ROOT}/airflow-exporter"
airflow-exporter-tests:
./tests/airflow-exporter/check_path.sh "jjaniec/airflow-exporter:latest"
./tests/airflow-exporter/metrics_exists.sh "jjaniec/airflow-exporter:latest"
airflow-exporter-patch:
./patch-images.sh src/airflow-exporter jjaniec/airflow-exporter airflow-exporter-tests

img-docker-alias:
cd src/img-docker-alias && ./build-latest.sh "${REPOSITORY_ROOT}/img-docker-alias"
Expand Down
85 changes: 0 additions & 85 deletions patch-images.sh

This file was deleted.

191 changes: 191 additions & 0 deletions patching/image-patchlist.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@
target_repository_prefix: docker.io/jjaniec

defaults:
patch_latest_releases_count: 5
additional_fixed_tags: []
patch_latest_tag: true
generate_ots_dockerhub_readme: true

repositories:
# - name: airflow-exporter
# source_type: dockerhub
# source_repository: jjaniec/airflow-exporter
# patch_latest_releases_count: 2
# release_releases_tag_grep_regexp: '^\d+\.\d+\.\d+$'
# additional_fixed_tags: []
# patch_latest_tag: true
# generate_ots_dockerhub_readme: false

- name: mlflow
source_type: ghcr
source_repository: mlflow/mlflow
patch_latest_releases_count: 5
release_releases_tag_grep_regexp: '^v\d+\.\d+\.\d+$'
additional_fixed_tags: []
patch_latest_tag: false
generate_ots_dockerhub_readme: true

# - name: consul
# source_type: dockerhub
# source_repository: library/consul
# patch_latest_releases_count: 10
# release_releases_tag_grep_regexp: '^\d+\.\d+\.\d+$'
# additional_fixed_tags: []
# patch_latest_tag: true
# generate_ots_dockerhub_readme: true

# - name: vault
# source_type: dockerhub
# source_repository: library/vault
# patch_latest_releases_count: 10
# release_releases_tag_grep_regexp: '^\d+\.\d+\.\d+$'
# additional_fixed_tags: []
# patch_latest_tag: true
# generate_ots_dockerhub_readme: true

- name: prometheus
source_type: dockerhub
source_repository: prom/prometheus
patch_latest_releases_count: 10
release_releases_tag_grep_regexp: '^\d+\.\d+\.\d+$'
additional_fixed_tags: []
patch_latest_tag: true
generate_ots_dockerhub_readme: true

- name: grafana
source_type: dockerhub
source_repository: grafana/grafana
patch_latest_releases_count: 10
release_releases_tag_grep_regexp: '^\d+\.\d+\.\d+$'
additional_fixed_tags: []
patch_latest_tag: true
generate_ots_dockerhub_readme: true

# - name: curl
# source_type: dockerhub
# source_repository: curlimages/curl
# patch_latest_releases_count: 10
# release_releases_tag_grep_regexp: '^\d+\.\d+\.\d+$'
# additional_fixed_tags: []
# patch_latest_tag: true
# generate_ots_dockerhub_readme: true

# - name: envoy
# source_type: dockerhub
# source_repository: envoyproxy/envoy
# patch_latest_releases_count: 10
# release_releases_tag_grep_regexp: '^v\d+\.\d+\.\d+$'
# additional_fixed_tags: []
# patch_latest_tag: true
# generate_ots_dockerhub_readme: true

# - name: etcd
# source_type: dockerhub
# source_repository: bitnami/etcd
# patch_latest_releases_count: 10
# release_releases_tag_grep_regexp: '^\d+\.\d+\.\d+$'
# additional_fixed_tags: []
# patch_latest_tag: true
# generate_ots_dockerhub_readme: true

# - name: haproxy
# source_type: dockerhub
# source_repository: library/haproxy
# patch_latest_releases_count: 10
# release_releases_tag_grep_regexp: '^\d+\.\d++$'
# additional_fixed_tags: []
# patch_latest_tag: true
# generate_ots_dockerhub_readme: true

# - name: nats
# source_type: dockerhub
# source_repository: library/nats
# patch_latest_releases_count: 10
# release_releases_tag_grep_regexp: '^\d+\.\d+\.\d+$'
# additional_fixed_tags: []
# patch_latest_tag: true
# generate_ots_dockerhub_readme: true

# - name: nginx
# source_type: dockerhub
# source_repository: library/nginx
# patch_latest_releases_count: 10
# release_releases_tag_grep_regexp: '^\d+\.\d++$'
# additional_fixed_tags: []
# patch_latest_tag: true
# generate_ots_dockerhub_readme: true

# - name: rabbitmq
# source_type: dockerhub
# source_repository: library/rabbitmq
# patch_latest_releases_count: 10
# release_releases_tag_grep_regexp: '^\d+\.\d+\.\d+$'
# additional_fixed_tags: []
# patch_latest_tag: true
# generate_ots_dockerhub_readme: true

# - name: redis
# source_type: dockerhub
# source_repository: library/redis
# patch_latest_releases_count: 10
# release_releases_tag_grep_regexp: '^\d+\.\d+$'
# additional_fixed_tags: []
# patch_latest_tag: true
# generate_ots_dockerhub_readme: true

- name: traefik
source_type: dockerhub
source_repository: library/traefik
patch_latest_releases_count: 10
release_releases_tag_grep_regexp: '^v\d+\.\d+$'
additional_fixed_tags: []
patch_latest_tag: true
generate_ots_dockerhub_readme: true

- name: zenml-server
source_type: dockerhub
source_repository: zenmldocker/zenml-server
patch_latest_releases_count: 10
release_releases_tag_grep_regexp: '^\d+\.\d+\.\d+$'
additional_fixed_tags: []
patch_latest_tag: true
generate_ots_dockerhub_readme: true

- name: zenml
source_type: dockerhub
source_repository: zenmldocker/zenml
patch_latest_releases_count: 10
release_releases_tag_grep_regexp: '^\d+\.\d+\.\d+$'
additional_fixed_tags: []
patch_latest_tag: true
generate_ots_dockerhub_readme: true

- name: jenkins
source_type: dockerhub
source_repository: jenkins/jenkins
patch_latest_releases_count: 10
release_releases_tag_grep_regexp: '^\d+\.\d+\.[2-9]$'
additional_fixed_tags:
- latest-jdk11
- slim
- slim-jdk11
patch_latest_tag: true
generate_ots_dockerhub_readme: true

- name: terraform
source_type: dockerhub
source_repository: hashicorp/terraform
patch_latest_releases_count: 50
release_releases_tag_grep_regexp: '^[1-9]+\.\d+\.\d+$'
additional_fixed_tags: []
patch_latest_tag: true
generate_ots_dockerhub_readme: true

- name: label-studio
source_type: dockerhub
source_repository: heartexlabs/label-studio
patch_latest_releases_count: 20
release_releases_tag_grep_regexp: '^[1-9]+\.\d+\.\d+$'
additional_fixed_tags: []
patch_latest_tag: true
generate_ots_dockerhub_readme: true
Loading

0 comments on commit dee5234

Please sign in to comment.