fix action
This commit is contained in:
parent
f15d55028c
commit
bdbd6bae88
2 changed files with 44 additions and 23 deletions
50
.github/workflows/docker-release.yml
vendored
50
.github/workflows/docker-release.yml
vendored
|
@ -7,21 +7,26 @@ on:
|
|||
|
||||
jobs:
|
||||
push_to_registry:
|
||||
name: Push Docker image to Docker Hub
|
||||
name: Push Docker image to registry
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
-
|
||||
name: Check out the repo
|
||||
- name: Check out the repo
|
||||
uses: actions/checkout@v3
|
||||
-
|
||||
name: Log in to Docker Hub
|
||||
|
||||
- name: Log in to Docker Hub
|
||||
uses: docker/login-action@v2
|
||||
with:
|
||||
username: ${{ secrets.DOCKER_USERNAME }}
|
||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
||||
|
||||
-
|
||||
name: Docker metadata
|
||||
- name: Login to GitHub Container Registry
|
||||
uses: docker/login-action@v2
|
||||
with:
|
||||
registry: ghcr.io
|
||||
username: ${{ github.repository_owner }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Docker metadata
|
||||
id: meta
|
||||
uses: docker/metadata-action@v4
|
||||
with:
|
||||
|
@ -30,22 +35,39 @@ jobs:
|
|||
type=raw,value=latest
|
||||
type=ref,event=tag
|
||||
|
||||
-
|
||||
name: Set up QEMU
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v2
|
||||
|
||||
-
|
||||
name: Set up Docker Buildx
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v2
|
||||
|
||||
-
|
||||
name: Build and push Docker image
|
||||
- name: Build and push Docker image(dockerhub)
|
||||
uses: docker/build-push-action@v4
|
||||
with:
|
||||
context: .
|
||||
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
|
||||
platforms: linux/amd64,linux/arm64
|
||||
push: true
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
cache-from: type=gha
|
||||
cache-to: type=gha,mode=max
|
||||
|
||||
- name: Docker metadata(ghcr)
|
||||
id: meta2
|
||||
uses: docker/metadata-action@v4
|
||||
with:
|
||||
images: ghcr.io/hibobmaster/matrixchatgptbot
|
||||
tags: |
|
||||
type=raw,value=latest
|
||||
type=sha,format=long
|
||||
|
||||
- name: Build and push Docker image(ghcr)
|
||||
uses: docker/build-push-action@v4
|
||||
with:
|
||||
context: .
|
||||
platforms: linux/amd64,linux/arm64
|
||||
push: true
|
||||
tags: ${{ steps.meta2.outputs.tags }}
|
||||
labels: ${{ steps.meta2.outputs.labels }}
|
||||
cache-from: type=gha
|
||||
cache-to: type=gha,mode=max
|
||||
|
|
|
@ -1,15 +1,14 @@
|
|||
FROM python:3.11-alpine as base
|
||||
|
||||
FROM base as pybuilder
|
||||
RUN sed -i 's|v3\.\d*|edge|' /etc/apk/repositories
|
||||
RUN apk update && apk add olm-dev gcc musl-dev libmagic
|
||||
# RUN sed -i 's|v3\.\d*|edge|' /etc/apk/repositories
|
||||
RUN apk update && apk add --no-cache olm-dev gcc musl-dev libmagic libffi-dev
|
||||
COPY requirements.txt /requirements.txt
|
||||
RUN pip3 install --user -r /requirements.txt && rm /requirements.txt
|
||||
RUN pip install -U pip setuptools wheel && pip install --user -r /requirements.txt && rm /requirements.txt
|
||||
|
||||
|
||||
FROM base as runner
|
||||
LABEL "org.opencontainers.image.source"="https://github.com/hibobmaster/matrix_chatgpt_bot"
|
||||
RUN apk update && apk add olm-dev libmagic
|
||||
RUN apk update && apk add --no-cache olm-dev libmagic libffi-dev
|
||||
COPY --from=pybuilder /root/.local /usr/local
|
||||
COPY . /app
|
||||
|
||||
|
|
Loading…
Reference in a new issue