Procházet zdrojové kódy

cicd: Cleanup image tags, try pass correct credentials to goreleaser

jamesread před 3 roky
rodič
revize
2d806d8557
5 změnil soubory, kde provedl 4 přidání a 4 odebrání
  1. 1 1
      .github/workflows/build-tag.yml
  2. 0 3
      .goreleaser.yml
  3. 1 0
      Dockerfile
  4. 1 0
      Dockerfile.arm64
  5. 1 0
      Dockerfile.armv7

+ 1 - 1
.github/workflows/build-tag.yml

@@ -57,7 +57,7 @@ jobs:
           version: latest
           args: release --clean --parallelism 1
         env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Archive binaries
         uses: actions/upload-artifact@v2

+ 0 - 3
.goreleaser.yml

@@ -96,10 +96,8 @@ dockers:
     skip_push: false
     build_flag_templates:
       - "--platform=linux/amd64"
-      - "--label=org.opencontainers.image.title={{.ProjectName}}"
       - "--label=org.opencontainers.image.revision={{.FullCommit}}"
       - "--label=org.opencontainers.image.version={{.Tag}}"
-      - "--platform=linux/amd64"
     extra_files:
       - webui
 
@@ -112,7 +110,6 @@ dockers:
     skip_push: false
     build_flag_templates:
       - "--platform=linux/arm64"
-      - "--label=org.opencontainers.image.title={{.ProjectName}}"
       - "--label=org.opencontainers.image.revision={{.FullCommit}}"
       - "--label=org.opencontainers.image.version={{.Tag}}"
     extra_files:

+ 1 - 0
Dockerfile

@@ -1,6 +1,7 @@
 FROM --platform=linux/amd64 registry.fedoraproject.org/fedora-minimal:36-x86_64
 
 LABEL org.opencontainers.image.source https://github.com/OliveTin/OliveTin
+LABEL org.opencontainers.image.title=OliveTin
 
 RUN mkdir -p /config /var/www/olivetin \
     && microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \ 

+ 1 - 0
Dockerfile.arm64

@@ -1,6 +1,7 @@
 FROM --platform=linux/arm64 registry.fedoraproject.org/fedora-minimal:36-aarch64
 
 LABEL org.opencontainers.image.source https://github.com/OliveTin/OliveTin
+LABEL org.opencontainers.image.title=OliveTin
 
 RUN mkdir -p /config /var/www/olivetin \
     && \

+ 1 - 0
Dockerfile.armv7

@@ -1,6 +1,7 @@
 FROM --platform=linux/armhfp registry.fedoraproject.org/fedora-minimal:36-armhfp
 
 LABEL org.opencontainers.image.source https://github.com/OliveTin/OliveTin
+LABEL org.opencontainers.image.title=OliveTin
 
 RUN mkdir -p /config /var/www/olivetin \
     && \