Skip to content

Commit

Permalink
Merge pull request #1937 from owncloud/switch_to_official_redis_image
Browse files Browse the repository at this point in the history
Switch to official redis image
  • Loading branch information
wkloucek authored Apr 20, 2021
2 parents 734e556 + 8610b25 commit c073329
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 884 deletions.
5 changes: 1 addition & 4 deletions .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -1370,11 +1370,8 @@ def redis():
return [
{
'name': 'redis',
'image': 'webhippie/redis',
'image': 'redis:6-alpine',
'pull': 'always',
'environment': {
'REDIS_DATABASES': 1
},
}
]

Expand Down
34 changes: 17 additions & 17 deletions deployments/examples/owncloud10_with_oc_web/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -165,38 +165,38 @@ services:
restart: always

db:
image: webhippie/mariadb:latest
image: mariadb:10.5
environment:
MARIADB_ROOT_PASSWORD: owncloud
MARIADB_USERNAME: owncloud
MARIADB_PASSWORD: owncloud
MARIADB_DATABASE: owncloud
MARIADB_MAX_ALLOWED_PACKET: 128M
MARIADB_INNODB_LOG_FILE_SIZE: 256M
- MYSQL_ROOT_PASSWORD=owncloud
- MYSQL_USER=owncloud
- MYSQL_PASSWORD=owncloud
- MYSQL_DATABASE=owncloud
command: ["--max-allowed-packet=128M", "--innodb-log-file-size=64M"]
healthcheck:
test: ["CMD", "/usr/bin/healthcheck"]
interval: 30s
timeout: 10s
test: ["CMD", "mysqladmin", "ping", "-u", "root", "--password=owncloud"]
interval: 10s
timeout: 5s
retries: 5
volumes:
- mysql:/var/lib/mysql
- backup:/var/lib/backup
logging:
driver: "local"
restart: always

redis:
image: webhippie/redis:latest
environment:
- REDIS_DATABASES=1
image: redis:6
command: ["--databases", "1"]
healthcheck:
test: ["CMD", "redis-cli", "ping"]
interval: 10s
timeout: 5s
retries: 5
volumes:
- redis:/var/lib/redis
- redis:/data
logging:
driver: "local"
restart: always



volumes:
certs:
ocis-data:
Expand Down
8 changes: 0 additions & 8 deletions store/ocis-boilerplate/.codacy.yml

This file was deleted.

Loading

0 comments on commit c073329

Please sign in to comment.