Yuki Takei 6 лет назад
Родитель
Сommit
ea7fb05a6e
2 измененных файлов с 26 добавлено и 32 удалено
  1. 4 3
      .github/workflows/build-default.yml
  2. 22 29
      .github/workflows/build-nocdn.yml

+ 4 - 3
.github/workflows/build-rc.yml → .github/workflows/build-default.yml

@@ -2,9 +2,10 @@ name: Release Docker Images for RC
 
 
 on:
 on:
   push:
   push:
+    tags:
+      - v3.*
     branches:
     branches:
-      # FIXME: debug code
-      # - rc/*
+      - rc/*
       - support/github-actions
       - support/github-actions
 
 
 jobs:
 jobs:
@@ -25,7 +26,7 @@ jobs:
 
 
     - name: Build Docker Image
     - name: Build Docker Image
       run: |
       run: |
-        CACHE_REF=weseek/growi:3-cache
+        CACHE_REF=weseek/growi-cache:3
         docker buildx build \
         docker buildx build \
           --tag growi \
           --tag growi \
           --platform linux/amd64 \
           --platform linux/amd64 \

+ 22 - 29
.github/workflows/build.yml → .github/workflows/build-nocdn.yml

@@ -1,4 +1,4 @@
-name: Release Docker Images
+name: Release Docker Images (NOCDN)
 
 
 on:
 on:
   push:
   push:
@@ -7,7 +7,7 @@ on:
 
 
 jobs:
 jobs:
 
 
-  build:
+  build-rc:
 
 
     runs-on: ubuntu-latest
     runs-on: ubuntu-latest
 
 
@@ -17,42 +17,35 @@ jobs:
     - name: Set up Docker Buildx
     - name: Set up Docker Buildx
       uses: crazy-max/ghaction-docker-buildx@v1.0.4
       uses: crazy-max/ghaction-docker-buildx@v1.0.4
 
 
-    - name: Build Docker Image
-      run: |
-        docker buildx build \
-          --tag growi
-          --platform linux/amd64 \
-          --output "type=image,push=false" \
-          --file ./docker/Dockerfile .
-
     - name: Login to docker.io registry
     - name: Login to docker.io registry
       run: |
       run: |
-        docker login --username wsmoogle --password ${{ secrets. DOCKER_REGISTRY_PASSWORD }}
-
-    - name: Publish
-      run: |
-        docker tag growi weseek/growi:latest
-        docker publish weseek/growi:latest
-
-  build-nocdn:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-
-    - name: Set up Docker Buildx
-      uses: crazy-max/ghaction-docker-buildx@v1.0.4
+        echo ${{ secrets. DOCKER_REGISTRY_PASSWORD }} | docker login --username wsmoogle --password-stdin
 
 
     - name: Build Docker Image
     - name: Build Docker Image
       run: |
       run: |
+        CACHE_REF=weseek/growi-cache:3-nocdn
         docker buildx build \
         docker buildx build \
-          --tag growi-nocdn
-          --build-arg flavor=nocdn
+          --tag growi \
           --platform linux/amd64 \
           --platform linux/amd64 \
-          --output "type=image,push=false" \
+          --load \
+          --cache-from=type=registry,ref=$CACHE_REF \
+          --cache-to=type=registry,ref=$CACHE_REF,mode=max \
           --file ./docker/Dockerfile .
           --file ./docker/Dockerfile .
 
 
+    - name: Get SemVer
+      run: |
+        semver=`npm run version --silent`
+        echo ::set-env name=SEMVER::$(echo $semver)
+
+    - name: Docker Tags by SemVer
+      uses: weseek/ghaction-docker-tags-by-semver@v1.0.3
+      with:
+        source: growi
+        target: weseek/growi
+        semver: ${{ env.SEMVER }}
+        suffix: -nocdn
+        publish: true
+
   publish-desc:
   publish-desc:
 
 
     runs-on: ubuntu-latest
     runs-on: ubuntu-latest