Skip to content

Commit

Permalink
Replace Docker Hub with Aliyun repositories
Browse files Browse the repository at this point in the history
  • Loading branch information
ARC-MX committed Jun 6, 2024
1 parent 11c4bac commit 76fa6bd
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 9 deletions.
20 changes: 17 additions & 3 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,25 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Log into registry
run: echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
- name: Log into docker hub registry
run: echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin

- name: pull Docker and push to Aliyun
run: |
docker pull mongo:4.4.18
docker tag mongo:4.4.18 registry.cn-hangzhou.aliyuncs.com/arcw/mongo:4.4.18
- name: Build and push Docker image
run: |
PLATFORMS=linux/arm64,linux/amd64,linux/arm/v7
DOCKER_IMAGE=arcw/sgcc_electricity
docker buildx build --platform $PLATFORMS -t $DOCKER_IMAGE:latest -t $DOCKER_IMAGE:1.4.0 --file Dockerfile-for-github-action --push .
docker buildx build --platform $PLATFORMS -t $DOCKER_IMAGE:latest -t $DOCKER_IMAGE:1.4.0 --file Dockerfile-for-github-action --push .
- name: Log into Aliyun hub registry and push Docker image
run: |
echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.ALIYUN_USERNAME }} --password-stdin registry.cn-hangzhou.aliyuncs.com
PLATFORMS=linux/arm64,linux/amd64,linux/arm/v7
DOCKER_IMAGE=registry.cn-hangzhou.aliyuncs.com/arcw/sgcc_electricity
docker buildx build --platform $PLATFORMS -t $DOCKER_IMAGE:latest -t $DOCKER_IMAGE:1.4.0 --file Dockerfile-for-github-action --push .
docker push registry.cn-hangzhou.aliyuncs.com/arcw/mongo:4.4.18
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.8-slim-buster as build
FROM python:3.9-bullseye as build

ENV PYTHONDONTWRITEBYTECODE 1
ENV PYTHONUNBUFFERED 1
Expand Down
13 changes: 10 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,21 +108,28 @@
# 日志级别
LOG_LEVEL="INFO" # 例如“DEBUG”可以查看出错情况
```
4. 运行
4. 镜像拉取

```bash
docker compose up --build
# 或者后台运行
docker compose up -d --build
```
5. 更新容器
5. 运行

```bash
docker compose up --build
# 或者后台运行
docker compose up -d --build
```
6. 更新容器

```bash
docker compose down # 删除容器
docker compose pull # 更新镜像
docker compose up # 重新运行
```
6. 运行成功应该显示如下日志:
7. 运行成功应该显示如下日志:

```bash
2024-06-06 16:00:43 [INFO ] ---- 程序开始,当前仓库版本为1.3.3,仓库地址为https://github.com/ARC-MX/sgcc_electricity_new.git
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
- .env
depends_on:
- mongo
image: arcw/sgcc_electricity:latest # armv8
image: registry.cn-hangzhou.aliyuncs.com/arcw/sgcc_electricity:latest # armv8
# build:
# context: .
# dockerfile: Dockerfile
Expand All @@ -22,7 +22,7 @@ services:
command: python3 main.py
# 默认将近30天数据写入mongo数据库,方便查询
mongo:
image: mongo:4.4.18
image: registry.cn-hangzhou.aliyuncs.com/arcw/mongo:4.4.18
restart: always
container_name: mongo-for-sgcc
networks:
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ Pillow==9.2.0
undetected_chromedriver==3.4.7
pymongo~=3.12.0
# onnxruntime==1.17.3
numpy==1.24.3
python-dotenv

0 comments on commit 76fa6bd

Please sign in to comment.