diff --git a/README.md b/README.md index b94b401..03d2eaa 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,8 @@ This project contains a Docker image meant to facilitate the deployment of [Naco ## Precautions -After the latest `nacos/nacos-server:latest` image, the **database master-slave image** has been removed. For specific reasons, refer to [Removing the Master-Slave Image Configuration](https://github.com/nacos-group/nacos-docker/wiki/%E7%A7%BB%E9%99%A4%E6%95%B0%E6%8D%AE%E5%BA%93%E4%B8%BB%E4%BB%8E%E9%95%9C%E5%83%8F%E9%85%8D%E7%BD%AE) +* The **database master-slave image** has been removed, after the latest `nacos/nacos-server:latest` image. For specific reasons, refer to [Removing the Master-Slave Image Configuration](https://github.com/nacos-group/nacos-docker/wiki/%E7%A7%BB%E9%99%A4%E6%95%B0%E6%8D%AE%E5%BA%93%E4%B8%BB%E4%BB%8E%E9%95%9C%E5%83%8F%E9%85%8D%E7%BD%AE) +* Since Nacos 1.3.1 version, the database storage has been upgraded to 8.0, and it is backward compatible diff --git a/README_ZH.md b/README_ZH.md index 73b5c14..0aff204 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -20,8 +20,8 @@ ### 注意事项 - 从最新的nacos:nacos-server/latest 镜像以后,移除了数据库主从镜像,具体原因请参考[移除主从镜像配置](https://github.com/nacos-group/nacos-docker/wiki/%E7%A7%BB%E9%99%A4%E6%95%B0%E6%8D%AE%E5%BA%93%E4%B8%BB%E4%BB%8E%E9%95%9C%E5%83%8F%E9%85%8D%E7%BD%AE) - +* 从最新的nacos:nacos-server/latest 镜像以后,移除了数据库主从镜像,具体原因请参考[移除主从镜像配置](https://github.com/nacos-group/nacos-docker/wiki/%E7%A7%BB%E9%99%A4%E6%95%B0%E6%8D%AE%E5%BA%93%E4%B8%BB%E4%BB%8E%E9%95%9C%E5%83%8F%E9%85%8D%E7%BD%AE) +* 从Nacos 1.3.1版本开始,数据库存储已经升级到8.0,并且它向下兼容 ## 快速开始 diff --git a/build/Dockerfile b/build/Dockerfile index 8c6d296..f7799af 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -20,17 +20,17 @@ ENV MODE="cluster" \ TOMCAT_ACCESSLOG_ENABLED="false" \ TIME_ZONE="Asia/Shanghai" -ARG NACOS_VERSION=1.3.0 +ARG NACOS_VERSION=1.3.1 WORKDIR /$BASE_DIR RUN set -x \ && yum update -y \ - && yum install -y java-1.8.0-openjdk java-1.8.0-openjdk-devel wget iputils nc vim libcurl\ - && wget https://github.com/alibaba/nacos/releases/download/${NACOS_VERSION}/nacos-server-${NACOS_VERSION}.tar.gz -P /home \ - && tar -xzvf /home/nacos-server-${NACOS_VERSION}.tar.gz -C /home \ - && rm -rf /home/nacos-server-${NACOS_VERSION}.tar.gz /home/nacos/bin/* /home/nacos/conf/*.properties /home/nacos/conf/*.example /home/nacos/conf/nacos-mysql.sql \ - && yum autoremove -y wget \ + && yum install -y java-1.8.0-openjdk java-1.8.0-openjdk-devel wget iputils nc vim libcurl +RUN wget https://github.com/alibaba/nacos/releases/download/${NACOS_VERSION}/nacos-server-${NACOS_VERSION}.tar.gz -P /home +RUN tar -xzvf /home/nacos-server-${NACOS_VERSION}.tar.gz -C /home \ + && rm -rf /home/nacos-server-${NACOS_VERSION}.tar.gz /home/nacos/bin/* /home/nacos/conf/*.properties /home/nacos/conf/*.example /home/nacos/conf/nacos-mysql.sql +RUN yum autoremove -y wget \ && ln -snf /usr/share/zoneinfo/$TIME_ZONE /etc/localtime && echo $TIME_ZONE > /etc/timezone \ && yum clean all diff --git a/example/plugins/mysql/mysql-connector-java-8.0.19.jar b/example/plugins/mysql/mysql-connector-java-8.0.19.jar deleted file mode 100644 index 7750517..0000000 Binary files a/example/plugins/mysql/mysql-connector-java-8.0.19.jar and /dev/null differ diff --git a/example/standalone-mysql-8.yaml b/example/standalone-mysql-8.yaml index 83a6e76..dc00af0 100644 --- a/example/standalone-mysql-8.yaml +++ b/example/standalone-mysql-8.yaml @@ -1,12 +1,11 @@ version: "2" services: nacos: - image: nacos/nacos-server:latest + image: nacos/nacos-server:1.3.1 container_name: nacos-standalone-mysql env_file: - ../env/nacos-standlone-mysql.env volumes: - - ./plugins/mysql/:/home/nacos/plugins/mysql/ - ./standalone-logs/:/home/nacos/logs - ./init.d/custom.properties:/home/nacos/init.d/custom.properties ports: @@ -14,7 +13,7 @@ services: - "9555:9555" depends_on: - mysql - restart: on-failure + restart: always mysql: container_name: mysql image: nacos/nacos-mysql:8.0.16