mirror of
https://github.com/argoproj/argo-cd
synced 2026-04-21 17:07:16 +00:00
chore: Update redis to 5.0.10 (#4767)
Signed-off-by: jannfis <jann@mistrust.net>
This commit is contained in:
parent
96e0f0d3be
commit
3e19b2fdf1
10 changed files with 16 additions and 16 deletions
2
.github/workflows/ci-build.yaml
vendored
2
.github/workflows/ci-build.yaml
vendored
|
|
@ -337,7 +337,7 @@ jobs:
|
|||
run: |
|
||||
docker pull quay.io/dexidp/dex:v2.25.0
|
||||
docker pull argoproj/argo-cd-ci-builder:v1.0.0
|
||||
docker pull redis:5.0.8-alpine
|
||||
docker pull redis:5.0.10-alpine
|
||||
- name: Create target directory for binaries in the build-process
|
||||
run: |
|
||||
mkdir -p dist
|
||||
|
|
|
|||
2
Procfile
2
Procfile
|
|
@ -1,7 +1,7 @@
|
|||
controller: sh -c "FORCE_LOG_COLORS=1 ARGOCD_FAKE_IN_CLUSTER=true ARGOCD_TLS_DATA_PATH=${ARGOCD_TLS_DATA_PATH:-/tmp/argocd-local/tls} ARGOCD_SSH_DATA_PATH=${ARGOCD_SSH_DATA_PATH:-/tmp/argocd-local/ssh} go run ./cmd/argocd-application-controller/main.go --loglevel debug --redis localhost:${ARGOCD_E2E_REDIS_PORT:-6379} --repo-server localhost:${ARGOCD_E2E_REPOSERVER_PORT:-8081}"
|
||||
api-server: sh -c "FORCE_LOG_COLORS=1 ARGOCD_FAKE_IN_CLUSTER=true ARGOCD_TLS_DATA_PATH=${ARGOCD_TLS_DATA_PATH:-/tmp/argocd-local/tls} ARGOCD_SSH_DATA_PATH=${ARGOCD_SSH_DATA_PATH:-/tmp/argocd-local/ssh} go run ./cmd/argocd-server/main.go --loglevel debug --redis localhost:${ARGOCD_E2E_REDIS_PORT:-6379} --disable-auth=${ARGOCD_E2E_DISABLE_AUTH:-'true'} --insecure --dex-server http://localhost:${ARGOCD_E2E_DEX_PORT:-5556} --repo-server localhost:${ARGOCD_E2E_REPOSERVER_PORT:-8081} --port ${ARGOCD_E2E_APISERVER_PORT:-8080} --staticassets ui/dist/app"
|
||||
dex: sh -c "go run github.com/argoproj/argo-cd/cmd/argocd-util gendexcfg -o `pwd`/dist/dex.yaml && docker run --rm -p ${ARGOCD_E2E_DEX_PORT:-5556}:${ARGOCD_E2E_DEX_PORT:-5556} -v `pwd`/dist/dex.yaml:/dex.yaml quay.io/dexidp/dex:v2.25.0 serve /dex.yaml"
|
||||
redis: docker run --rm --name argocd-redis -i -p ${ARGOCD_E2E_REDIS_PORT:-6379}:${ARGOCD_E2E_REDIS_PORT:-6379} redis:5.0.8-alpine --save "" --appendonly no --port ${ARGOCD_E2E_REDIS_PORT:-6379}
|
||||
redis: docker run --rm --name argocd-redis -i -p ${ARGOCD_E2E_REDIS_PORT:-6379}:${ARGOCD_E2E_REDIS_PORT:-6379} redis:5.0.10-alpine --save "" --appendonly no --port ${ARGOCD_E2E_REDIS_PORT:-6379}
|
||||
repo-server: sh -c "FORCE_LOG_COLORS=1 ARGOCD_FAKE_IN_CLUSTER=true ARGOCD_GNUPGHOME=${ARGOCD_GNUPGHOME:-/tmp/argocd-local/gpg/keys} ARGOCD_GPG_DATA_PATH=${ARGOCD_GPG_DATA_PATH:-/tmp/argocd-local/gpg/source} ARGOCD_TLS_DATA_PATH=${ARGOCD_TLS_DATA_PATH:-/tmp/argocd-local/tls} ARGOCD_SSH_DATA_PATH=${ARGOCD_SSH_DATA_PATH:-/tmp/argocd-local/ssh} go run ./cmd/argocd-repo-server/main.go --loglevel debug --port ${ARGOCD_E2E_REPOSERVER_PORT:-8081} --redis localhost:${ARGOCD_E2E_REDIS_PORT:-6379}"
|
||||
ui: sh -c 'cd ui && ${ARGOCD_E2E_YARN_CMD:-yarn} start'
|
||||
git-server: test/fixture/testrepos/start-git.sh
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ spec:
|
|||
serviceAccountName: argocd-redis
|
||||
containers:
|
||||
- name: redis
|
||||
image: redis:5.0.8
|
||||
image: redis:5.0.10-alpine
|
||||
imagePullPolicy: Always
|
||||
args:
|
||||
- "--save"
|
||||
|
|
|
|||
|
|
@ -647,7 +647,7 @@ spec:
|
|||
serviceAccountName: argocd-redis-ha
|
||||
initContainers:
|
||||
- name: config-init
|
||||
image: redis:5.0.8-alpine
|
||||
image: redis:5.0.10-alpine
|
||||
imagePullPolicy: IfNotPresent
|
||||
resources:
|
||||
{}
|
||||
|
|
@ -674,7 +674,7 @@ spec:
|
|||
mountPath: /data
|
||||
containers:
|
||||
- name: redis
|
||||
image: redis:5.0.8-alpine
|
||||
image: redis:5.0.10-alpine
|
||||
imagePullPolicy: IfNotPresent
|
||||
command:
|
||||
- redis-server
|
||||
|
|
@ -694,7 +694,7 @@ spec:
|
|||
- mountPath: /data
|
||||
name: data
|
||||
- name: sentinel
|
||||
image: redis:5.0.8-alpine
|
||||
image: redis:5.0.10-alpine
|
||||
imagePullPolicy: IfNotPresent
|
||||
command:
|
||||
- redis-sentinel
|
||||
|
|
|
|||
|
|
@ -8,4 +8,4 @@ redis-ha:
|
|||
haproxy:
|
||||
enabled: true
|
||||
image:
|
||||
tag: 5.0.8-alpine
|
||||
tag: 5.0.10-alpine
|
||||
|
|
|
|||
|
|
@ -3138,7 +3138,7 @@ spec:
|
|||
- /data/conf/redis.conf
|
||||
command:
|
||||
- redis-server
|
||||
image: redis:5.0.8-alpine
|
||||
image: redis:5.0.10-alpine
|
||||
imagePullPolicy: IfNotPresent
|
||||
livenessProbe:
|
||||
initialDelaySeconds: 15
|
||||
|
|
@ -3156,7 +3156,7 @@ spec:
|
|||
- /data/conf/sentinel.conf
|
||||
command:
|
||||
- redis-sentinel
|
||||
image: redis:5.0.8-alpine
|
||||
image: redis:5.0.10-alpine
|
||||
imagePullPolicy: IfNotPresent
|
||||
livenessProbe:
|
||||
initialDelaySeconds: 15
|
||||
|
|
@ -3182,7 +3182,7 @@ spec:
|
|||
value: 896627000a81c7bdad8dbdcffd39728c9c17b309
|
||||
- name: SENTINEL_ID_2
|
||||
value: 3acbca861108bc47379b71b1d87d1c137dce591f
|
||||
image: redis:5.0.8-alpine
|
||||
image: redis:5.0.10-alpine
|
||||
imagePullPolicy: IfNotPresent
|
||||
name: config-init
|
||||
resources: {}
|
||||
|
|
|
|||
|
|
@ -3053,7 +3053,7 @@ spec:
|
|||
- /data/conf/redis.conf
|
||||
command:
|
||||
- redis-server
|
||||
image: redis:5.0.8-alpine
|
||||
image: redis:5.0.10-alpine
|
||||
imagePullPolicy: IfNotPresent
|
||||
livenessProbe:
|
||||
initialDelaySeconds: 15
|
||||
|
|
@ -3071,7 +3071,7 @@ spec:
|
|||
- /data/conf/sentinel.conf
|
||||
command:
|
||||
- redis-sentinel
|
||||
image: redis:5.0.8-alpine
|
||||
image: redis:5.0.10-alpine
|
||||
imagePullPolicy: IfNotPresent
|
||||
livenessProbe:
|
||||
initialDelaySeconds: 15
|
||||
|
|
@ -3097,7 +3097,7 @@ spec:
|
|||
value: 896627000a81c7bdad8dbdcffd39728c9c17b309
|
||||
- name: SENTINEL_ID_2
|
||||
value: 3acbca861108bc47379b71b1d87d1c137dce591f
|
||||
image: redis:5.0.8-alpine
|
||||
image: redis:5.0.10-alpine
|
||||
imagePullPolicy: IfNotPresent
|
||||
name: config-init
|
||||
resources: {}
|
||||
|
|
|
|||
|
|
@ -2478,7 +2478,7 @@ spec:
|
|||
- ""
|
||||
- --appendonly
|
||||
- "no"
|
||||
image: redis:5.0.8
|
||||
image: redis:5.0.10-alpine
|
||||
imagePullPolicy: Always
|
||||
name: redis
|
||||
ports:
|
||||
|
|
|
|||
|
|
@ -2393,7 +2393,7 @@ spec:
|
|||
- ""
|
||||
- --appendonly
|
||||
- "no"
|
||||
image: redis:5.0.8
|
||||
image: redis:5.0.10-alpine
|
||||
imagePullPolicy: Always
|
||||
name: redis
|
||||
ports:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
FROM redis:5.0.8 as redis
|
||||
FROM redis:5.0.10 as redis
|
||||
|
||||
FROM node:12.18.4 as node
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue