diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index 070e0fa92c06a..042a542267bd9 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -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 diff --git a/Procfile b/Procfile index a96ddd261584b..2cadf616e852f 100644 --- a/Procfile +++ b/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 diff --git a/manifests/base/redis/argocd-redis-deployment.yaml b/manifests/base/redis/argocd-redis-deployment.yaml index 9e7c4516be384..af42a8ae2143b 100644 --- a/manifests/base/redis/argocd-redis-deployment.yaml +++ b/manifests/base/redis/argocd-redis-deployment.yaml @@ -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" diff --git a/manifests/ha/base/redis-ha/chart/upstream.yaml b/manifests/ha/base/redis-ha/chart/upstream.yaml index bef4ff936eeb4..9364c0a9316f8 100644 --- a/manifests/ha/base/redis-ha/chart/upstream.yaml +++ b/manifests/ha/base/redis-ha/chart/upstream.yaml @@ -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 diff --git a/manifests/ha/base/redis-ha/chart/values.yaml b/manifests/ha/base/redis-ha/chart/values.yaml index 73a7ec638cd3d..3b029c8d8d05b 100644 --- a/manifests/ha/base/redis-ha/chart/values.yaml +++ b/manifests/ha/base/redis-ha/chart/values.yaml @@ -8,4 +8,4 @@ redis-ha: haproxy: enabled: true image: - tag: 5.0.8-alpine \ No newline at end of file + tag: 5.0.10-alpine diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml index 4daa4261f4fa0..8c8cd0082cb42 100644 --- a/manifests/ha/install.yaml +++ b/manifests/ha/install.yaml @@ -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: {} diff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml index 95842b43051d7..04f0d09f5182d 100644 --- a/manifests/ha/namespace-install.yaml +++ b/manifests/ha/namespace-install.yaml @@ -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: {} diff --git a/manifests/install.yaml b/manifests/install.yaml index 496f3593bbe2c..22244a8976631 100644 --- a/manifests/install.yaml +++ b/manifests/install.yaml @@ -2478,7 +2478,7 @@ spec: - "" - --appendonly - "no" - image: redis:5.0.8 + image: redis:5.0.10-alpine imagePullPolicy: Always name: redis ports: diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml index bf4185994c1ac..b7d868094a0ab 100644 --- a/manifests/namespace-install.yaml +++ b/manifests/namespace-install.yaml @@ -2393,7 +2393,7 @@ spec: - "" - --appendonly - "no" - image: redis:5.0.8 + image: redis:5.0.10-alpine imagePullPolicy: Always name: redis ports: diff --git a/test/container/Dockerfile b/test/container/Dockerfile index 4805400cc2d61..40dd532d19154 100644 --- a/test/container/Dockerfile +++ b/test/container/Dockerfile @@ -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