Commit 733dc7d99b6542ff459ef5d80f1a07f2ad4d9f3c
1 parent
feb1953f
fix: update redis-dockerfile
Showing
3 changed files
with
8 additions
and
3 deletions
docker-compose.yml
| @@ -50,10 +50,13 @@ services: | @@ -50,10 +50,13 @@ services: | ||
| 50 | 50 | ||
| 51 | redis-server: | 51 | redis-server: |
| 52 | container_name: redis-server | 52 | container_name: redis-server |
| 53 | - image: redis:7 | 53 | + image: redis:6.2 |
| 54 | build: | 54 | build: |
| 55 | context: . | 55 | context: . |
| 56 | dockerfile: redis-dockerfile | 56 | dockerfile: redis-dockerfile |
| 57 | + environment: | ||
| 58 | + REDIS_PASSWORD: guzijian | ||
| 59 | + | ||
| 57 | volumes: | 60 | volumes: |
| 58 | - /ruoyi/redis/redis.conf:/etc/redis/redis.conf | 61 | - /ruoyi/redis/redis.conf:/etc/redis/redis.conf |
| 59 | - /ruoyi/redis/data:/data | 62 | - /ruoyi/redis/data:/data |
redis-dockerfile
| 1 | -FROM redis:7 | 1 | +FROM redis:6.2 |
| 2 | MAINTAINER guzijian | 2 | MAINTAINER guzijian |
| 3 | +EXPOSE 6379 | ||
| 3 | RUN echo "requirepass guzijian" >> /etc/redis/redis.conf | 4 | RUN echo "requirepass guzijian" >> /etc/redis/redis.conf |
| 4 | # 设置Redis快照 | 5 | # 设置Redis快照 |
| 5 | RUN sed -i 's/^# save ""/save 900 1\nsave 300 10\nsave 60 10000/g' /etc/redis/redis.conf | 6 | RUN sed -i 's/^# save ""/save 900 1\nsave 300 10\nsave 60 10000/g' /etc/redis/redis.conf |
ruoyi-admin/admin-dockerfile
| @@ -9,11 +9,12 @@ ARG env_name | @@ -9,11 +9,12 @@ ARG env_name | ||
| 9 | ENV jar_name=$server_name | 9 | ENV jar_name=$server_name |
| 10 | # 获取环境 | 10 | # 获取环境 |
| 11 | ENV env_file=$env_name | 11 | ENV env_file=$env_name |
| 12 | +# 抽取常量 | ||
| 12 | ENV jar_home=/home/docker/ | 13 | ENV jar_home=/home/docker/ |
| 13 | # 工作区 | 14 | # 工作区 |
| 14 | RUN mkdir -p ${jar_home} | 15 | RUN mkdir -p ${jar_home} |
| 15 | # 指定工作区 | 16 | # 指定工作区 |
| 16 | -WORKDIR /home/docker/ | 17 | +WORKDIR ${jar_home} |
| 17 | # 把jar包复制到容器内 | 18 | # 把jar包复制到容器内 |
| 18 | COPY ./target/*.jar ${jar_home}${jar_name}.jar | 19 | COPY ./target/*.jar ${jar_home}${jar_name}.jar |
| 19 | # 执行命令 | 20 | # 执行命令 |