up build docker

This commit is contained in:
ljw
2024-09-27 17:32:25 +08:00
parent 814bf48a54
commit 74662ae58b
2 changed files with 10 additions and 27 deletions

View File

@@ -119,13 +119,9 @@ jobs:
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_ACCESS_TOKEN }} password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
- name: Get git tag - name: Extract version from tag
id: vars id: vars
run: | run: echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
T=${GITHUB_REF#refs/*/}
M=${T%%.*}
echo "GIT_TAG=$T" >> $GITHUB_ENV
echo "MAJOR_TAG=$M" >> $GITHUB_ENV
- name: Extract metadata (tags, labels) for Docker - name: Extract metadata (tags, labels) for Docker
id: meta id: meta
@@ -154,8 +150,7 @@ jobs:
ARCH=${{ matrix.job.docker_platform }} ARCH=${{ matrix.job.docker_platform }}
tags: | tags: |
lejianwen/rustdesk-api:latest-${{ matrix.job.platform }} lejianwen/rustdesk-api:latest-${{ matrix.job.platform }}
lejianwen/rustdesk-api:${{ env.GIT_TAG }}-${{ matrix.job.platform }} lejianwen/rustdesk-api:${{ env.TAG }}-${{ matrix.job.platform }}
lejianwen/rustdesk-api:${{ env.MAJOR_TAG }}-${{ matrix.job.platform }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
docker-manifest: docker-manifest:
@@ -163,9 +158,9 @@ jobs:
needs: docker needs: docker
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
# - name: Extract version from tag - name: Extract version from tag
# id: vars id: vars
# run: echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV run: echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
- name: Log in to Docker Hub - name: Log in to Docker Hub
uses: docker/login-action@v2 uses: docker/login-action@v2
@@ -173,25 +168,11 @@ jobs:
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_ACCESS_TOKEN }} password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
- name: Get git tag
id: vars
run: |
T=${GITHUB_REF#refs/*/}
M=${T%%.*}
echo "GIT_TAG=$T" >> $GITHUB_ENV
echo "MAJOR_TAG=$M" >> $GITHUB_ENV
- name: Create and push manifest (:version) - name: Create and push manifest (:version)
uses: Noelware/docker-manifest-action@master uses: Noelware/docker-manifest-action@master
with: with:
base-image: lejianwen/rustdesk-api:${{ env.GIT_TAG }} base-image: lejianwen/rustdesk-api:${{ env.TAG }}
extra-images: lejianwen/rustdesk-api:${{ env.GIT_TAG }}-amd64,lejianwen/rustdesk-api:${{ env.GIT_TAG }}-arm64 extra-images: lejianwen/rustdesk-api:${{ env.TAG }}-amd64,lejianwen/rustdesk-api:${{ env.TAG }}-arm64
push: true
- name: Create and push manifest (:MAJOR_TAG)
uses: Noelware/docker-manifest-action@master
with:
base-image: lejianwen/rustdesk-api:${{ env.MAJOR_TAG }}
extra-images: lejianwen/rustdesk-api:${{ env.MAJOR_TAG }}-amd64,lejianwen/rustdesk-api:${{ env.MAJOR_TAG }}-arm64
push: true push: true
# - name: Create and push manifest (:latest) # - name: Create and push manifest (:latest)

View File

@@ -1,4 +1,6 @@
FROM alpine FROM alpine
ARG ARCH
WORKDIR /app WORKDIR /app
RUN apk add --no-cache tzdata RUN apk add --no-cache tzdata
COPY ./release /app/ COPY ./release /app/