fix actions

opengisch · Nov 7, 2022 · 263984c · 263984c
1 parent 84b95a9
commit 263984c
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 150 deletions.
diff --git a/.github/workflows/docker-image-latest.yml b/.github/workflows/docker-image-latest.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
 
- build-and-push-qwc2-minimal-base:
+ build-and-push-qwc2-minimal-latest:
 
  runs-on: ubuntu-latest
 
@@ -19,70 +19,31 @@ jobs:
  registry: ghcr.io
  username: ${{ github.actor }}
  password: ${{ secrets.GITHUB_TOKEN }}
- - name: Build and push mgdm2oereb-service
+ - name: Build and push qwc2-minimal-base
  uses: docker/build-push-action@v3
  with:
  context: ./
  push: true
  tags: ghcr.io/${{ github.repository }}-qwc2-minimal-base:latest
  target: qwc2_base
-
- build-and-push-qwc2-minimal-dev:
-
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v3
- - name: Login to GitHub Container Registry
- uses: docker/login-action@v2
- with:
- registry: ghcr.io
- username: ${{ github.actor }}
- password: ${{ secrets.GITHUB_TOKEN }}
- - name: Build and push mgdm2oereb-service
- uses: docker/build-push-action@v3
- with:
- context: ./
- push: true
- tags: ghcr.io/${{ github.repository }}-qwc2-minimal-dev:latest
- target: dev
-
- build-and-push-qwc2-minimal-builder:
-
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v3
- - name: Login to GitHub Container Registry
- uses: docker/login-action@v2
- with:
- registry: ghcr.io
- username: ${{ github.actor }}
- password: ${{ secrets.GITHUB_TOKEN }}
- - name: Build and push mgdm2oereb-service
- uses: docker/build-push-action@v3
- with:
- context: ./
- push: true
- tags: ghcr.io/${{ github.repository }}-qwc2-minimal-builder:latest
- target: builder
-
- build-and-push-qwc2-minimal-prod:
-
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v3
- - name: Login to GitHub Container Registry
- uses: docker/login-action@v2
- with:
- registry: ghcr.io
- username: ${{ github.actor }}
- password: ${{ secrets.GITHUB_TOKEN }}
- - name: Build and push mgdm2oereb-service
- uses: docker/build-push-action@v3
- with:
- context: ./
- push: true
- tags: ghcr.io/${{ github.repository }}-qwc2-minimal-prod:latest
- target: prod
+ - name: Build and push qwc2-minimal-dev
+ uses: docker/build-push-action@v3
+ with:
+ context: ./
+ push: true
+ tags: ghcr.io/${{ github.repository }}-qwc2-minimal-dev:latest
+ target: dev
+ - name: Build and push qwc2-minimal-builder
+ uses: docker/build-push-action@v3
+ with:
+ context: ./
+ push: true
+ tags: ghcr.io/${{ github.repository }}-qwc2-minimal-builder:latest
+ target: builder
+ - name: Build and push qwc2-minimal-prod
+ uses: docker/build-push-action@v3
+ with:
+ context: ./
+ push: true
+ tags: ghcr.io/${{ github.repository }}-qwc2-minimal-prod:latest
+ target: prod
diff --git a/.github/workflows/docker-image-nightly.yml b/.github/workflows/docker-image-nightly.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
 
- build-and-push-qwc2-minimal-base:
+ build-and-push-qwc2-minimal-nightly:
 
  runs-on: ubuntu-latest
 
@@ -19,70 +19,31 @@ jobs:
  registry: ghcr.io
  username: ${{ github.actor }}
  password: ${{ secrets.GITHUB_TOKEN }}
- - name: Build and push mgdm2oereb-service
+ - name: Build and push qwc2-minimal-base
  uses: docker/build-push-action@v3
  with:
  context: ./
  # do not push for the moment, to avoid load
  # push: true
  tags: ghcr.io/${{ github.repository }}-qwc2-minimal-base:${{ github.head_ref }}-${{ github.sha }}
  target: qwc2_base
-
- build-and-push-qwc2-minimal-dev:
-
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v3
- - name: Login to GitHub Container Registry
- uses: docker/login-action@v2
- with:
- registry: ghcr.io
- username: ${{ github.actor }}
- password: ${{ secrets.GITHUB_TOKEN }}
- - name: Build and push mgdm2oereb-service
+ - name: Build and push qwc2-minimal-dev
  uses: docker/build-push-action@v3
  with:
  context: ./
  # do not push for the moment, to avoid load
  # push: true
  tags: ghcr.io/${{ github.repository }}-qwc2-minimal-dev:${{ github.head_ref }}-${{ github.sha }}
  target: dev
-
- build-and-push-qwc2-minimal-builder:
-
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v3
- - name: Login to GitHub Container Registry
- uses: docker/login-action@v2
- with:
- registry: ghcr.io
- username: ${{ github.actor }}
- password: ${{ secrets.GITHUB_TOKEN }}
- - name: Build and push mgdm2oereb-service
+ - name: Build and push qwc2-minimal-builder
  uses: docker/build-push-action@v3
  with:
  context: ./
  # do not push for the moment, to avoid load
  # push: true
  tags: ghcr.io/${{ github.repository }}-qwc2-minimal-builder:${{ github.head_ref }}-${{ github.sha }}
  target: builder
-
- build-and-push-qwc2-minimal-prod:
-
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v3
- - name: Login to GitHub Container Registry
- uses: docker/login-action@v2
- with:
- registry: ghcr.io
- username: ${{ github.actor }}
- password: ${{ secrets.GITHUB_TOKEN }}
- - name: Build and push mgdm2oereb-service
+ - name: Build and push qwc2-minimal-prod
  uses: docker/build-push-action@v3
  with:
  context: ./

diff --git a/.github/workflows/docker-image-release.yml b/.github/workflows/docker-image-release.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
 
- build-and-push-qwc2-minimal-base:
+ build-and-push-qwc2-minimal-release:
 
  runs-on: ubuntu-latest
 
@@ -19,67 +19,28 @@ jobs:
  registry: ghcr.io
  username: ${{ github.actor }}
  password: ${{ secrets.GITHUB_TOKEN }}
- - name: Build and push mgdm2oereb-service
+ - name: Build and push qwc2-minimal-base
  uses: docker/build-push-action@v3
  with:
  context: ./
  push: true
  tags: ghcr.io/${{ github.repository }}-qwc2-minimal-base:${{ github.ref_name }}
  target: qwc2_base
-
- build-and-push-qwc2-minimal-dev:
-
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v3
- - name: Login to GitHub Container Registry
- uses: docker/login-action@v2
- with:
- registry: ghcr.io
- username: ${{ github.actor }}
- password: ${{ secrets.GITHUB_TOKEN }}
- - name: Build and push mgdm2oereb-service
+ - name: Build and push qwc2-minimal-dev
  uses: docker/build-push-action@v3
  with:
  context: ./
  push: true
  tags: ghcr.io/${{ github.repository }}-qwc2-minimal-dev:${{ github.ref_name }}
  target: dev
-
- build-and-push-qwc2-minimal-builder:
-
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v3
- - name: Login to GitHub Container Registry
- uses: docker/login-action@v2
- with:
- registry: ghcr.io
- username: ${{ github.actor }}
- password: ${{ secrets.GITHUB_TOKEN }}
- - name: Build and push mgdm2oereb-service
+ - name: Build and push qwc2-minimal-builder
  uses: docker/build-push-action@v3
  with:
  context: ./
  push: true
  tags: ghcr.io/${{ github.repository }}-qwc2-minimal-builder:${{ github.ref_name }}
  target: builder
-
- build-and-push-qwc2-minimal-prod:
-
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v3
- - name: Login to GitHub Container Registry
- uses: docker/login-action@v2
- with:
- registry: ghcr.io
- username: ${{ github.actor }}
- password: ${{ secrets.GITHUB_TOKEN }}
- - name: Build and push mgdm2oereb-service
+ - name: Build and push qwc2-minimal-prod
  uses: docker/build-push-action@v3
  with:
  context: ./