diff --git a/Dockerfile-for-github-action b/Dockerfile-for-github-action index a2c1e3b..064ec78 100644 --- a/Dockerfile-for-github-action +++ b/Dockerfile-for-github-action @@ -5,14 +5,14 @@ ENV PYTHONUNBUFFERED 1 WORKDIR /app -COPY scripts/* /app/ +# COPY scripts/* /app/ COPY ./requirements.txt /tmp/requirements.txt RUN apt-get --allow-releaseinfo-change update \ && apt-get install -y --no-install-recommends jq chromium chromium-driver tzdata\ && ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ && dpkg-reconfigure --frontend noninteractive tzdata \ - && rm -rf /var/lib/apt/lists/* \ + && rm -rf /var/lib/apt/lists/* \ && apt-get clean RUN cd /tmp \ @@ -25,7 +25,7 @@ RUN cd /tmp \ && pip cache purge \ && rm -rf /var/lib/apt/lists/* \ && rm -rf /var/log/* - + ENV LANG C.UTF-8 CMD ["python"] \ No newline at end of file diff --git a/README.md b/README.md index bedb8d9..ec5f8e6 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ # ⚡️国家电网电力获取 -[![Docker Image CI](https://github.com/renhaiidea/sgcc_electricity/actions/workflows/docker-image.yml/badge.svg)](https://github.com/renhaiidea/sgcc_electricity/actions/workflows/docker-image.yml) -[![Image Size](https://img.shields.io/docker/image-size/renhai/sgcc_electricity)](https://hub.docker.com/r/renhai/sgcc_electricity) -[![Docker Pull](https://img.shields.io/docker/pulls/renhai/sgcc_electricity?color=%2348BB78&logo=docker&label=pulls)](https://hub.docker.com/r/renhai/sgcc_electricity) +[![Docker Image CI](https://github.com/ARC-MX/sgcc_electricity_new/actions/workflows/docker-image.yml/badge.svg)](https://github.com/ARC-MX/sgcc_electricity_new/actions/workflows/docker-image.yml) +[![Image Size](https://img.shields.io/docker/image-size/arcw/sgcc_electricity)](https://hub.docker.com/r/arcw/sgcc_electricity) +[![Docker Pull](https://img.shields.io/docker/pulls/arcw/sgcc_electricity?color=%2348BB78&logo=docker&label=pulls)](https://hub.docker.com/r/arcw/sgcc_electricity)
@@ -36,7 +36,7 @@ > - `linux/amd64`:适用于 x86-64(amd64)架构的 Linux 系统,例如windows电脑。 > - `linux/arm64`:适用于 ARMv8 架构的 Linux 系统,例如树莓派,N1盒子。 -> - 其他架构比如32位arm/v7,不提供docker镜像,可参考[github仓库](https://github.com/renhaiidea/sgcc_electricity.git)的[Dockerfile-for-github-action-armv7](%B9%E9%B5%B5%2FDockerfile-for-github-action-armv7)自行部署。 +> - 其他架构比如32位arm/v7,不提供docker镜像,可参考[github仓库](https://github.com/ARC-MX/sgcc_electricity_new.git)的[Dockerfile-for-github-action-armv7](%B9%E9%B5%B5%2FDockerfile-for-github-action-armv7)自行部署。 ## 二、实现流程 @@ -118,7 +118,10 @@ - .env depends_on: - mongo - image: renhai/sgcc_electricity:latest + image: arcw/sgcc_electricity:latest # armv8 +# build: +# context: . +# dockerfile: Dockerfile container_name: sgcc_electricity networks: sgcc_network: diff --git a/docker-compose.yml b/docker-compose.yml index 649e3ea..4ae2e0f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,10 +6,10 @@ services: - .env depends_on: - mongo - # image: renhai/sgcc_electricity:latest # armv7 32架构的镜像为armv7-latest - build: - context: . - dockerfile: Dockerfile + image: arcw/sgcc_electricity:latest # armv8 + # build: + # context: . + # dockerfile: Dockerfile container_name: sgcc_electricity networks: sgcc_network: