From 696e0ff27ef905d5fd38cf246f2b268fc899efb8 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Wed, 14 Aug 2024 08:56:04 +0200 Subject: [PATCH] ci: use mirror or bitnami images This reduces chances of docker hub rate limiting. Bitnami images are excluded from rate limiting. --- .../workflows/cascade-setup-end-to-end.yml | 4 ++-- .forgejo/workflows/testing.yml | 22 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.forgejo/workflows/cascade-setup-end-to-end.yml b/.forgejo/workflows/cascade-setup-end-to-end.yml index dcca2404d9..404bbe8fa6 100644 --- a/.forgejo/workflows/cascade-setup-end-to-end.yml +++ b/.forgejo/workflows/cascade-setup-end-to-end.yml @@ -27,7 +27,7 @@ jobs: if: ${{ !startsWith(vars.ROLE, 'forgejo-') }} runs-on: docker container: - image: node:20-bookworm + image: code.forgejo.org/oci/node:20-bookworm steps: - name: event run: | @@ -52,7 +52,7 @@ jobs: ) runs-on: docker container: - image: node:20-bookworm + image: code.forgejo.org/oci/node:20-bookworm steps: - uses: actions/checkout@v4 with: diff --git a/.forgejo/workflows/testing.yml b/.forgejo/workflows/testing.yml index b4386071b1..53de8efaff 100644 --- a/.forgejo/workflows/testing.yml +++ b/.forgejo/workflows/testing.yml @@ -45,12 +45,12 @@ jobs: image: 'code.forgejo.org/oci/node:20-bookworm' services: elasticsearch: - image: elasticsearch:7.17.22 + image: docker.io/bitnami/elasticsearch:7 env: discovery.type: single-node ES_JAVA_OPTS: "-Xms512m -Xmx512m" minio: - image: bitnami/minio:2024.3.30 + image: docker.io/bitnami/minio:2024.3.30 options: >- --hostname gitea.minio env: @@ -101,13 +101,13 @@ jobs: matrix: cacher: # redis - - image: redis:7.2 + - image: docker.io/bitnami/redis:7.2 port: 6379 # redict - image: registry.redict.io/redict:7.3.0-scratch port: 6379 # valkey - - image: docker.io/valkey/valkey:7.2.5-alpine3.19 + - image: docker.io/bitnami/valkey:7.2 port: 6379 # garnet - image: ghcr.io/microsoft/garnet-alpine:1.0.14 @@ -154,14 +154,14 @@ jobs: image: 'code.forgejo.org/oci/node:20-bookworm' services: mysql: - image: 'docker.io/mysql:8-debian' + image: 'docker.io/bitnami/mysql:8.0' env: - MYSQL_ALLOW_EMPTY_PASSWORD: yes + ALLOW_EMPTY_PASSWORD: yes MYSQL_DATABASE: testgitea - # - # See also https://codeberg.org/forgejo/forgejo/issues/976 - # - cmd: ['mysqld', '--innodb-adaptive-flushing=OFF', '--innodb-buffer-pool-size=4G', '--innodb-log-buffer-size=128M', '--innodb-flush-log-at-trx-commit=0', '--innodb-flush-log-at-timeout=30', '--innodb-flush-method=nosync', '--innodb-fsync-threshold=1000000000'] + # + # See also https://codeberg.org/forgejo/forgejo/issues/976 + # + MYSQL_EXTRA_FLAGS: --innodb-adaptive-flushing=OFF --innodb-buffer-pool-size=4G --innodb-log-buffer-size=128M --innodb-flush-log-at-trx-commit=0 --innodb-flush-log-at-timeout=30 --innodb-flush-method=nosync --innodb-fsync-threshold=1000000000 steps: - uses: https://code.forgejo.org/actions/checkout@v3 - uses: https://code.forgejo.org/actions/setup-go@v4 @@ -200,7 +200,7 @@ jobs: image: 'code.forgejo.org/oci/node:20-bookworm' services: minio: - image: bitnami/minio:2024.3.30 + image: docker.io/bitnami/minio:2024.3.30 env: MINIO_ROOT_USER: 123456 MINIO_ROOT_PASSWORD: 12345678