Skip to content

Commit

Permalink
Merge pull request #4220 from greenbone/update-workflows-main
Browse files Browse the repository at this point in the history
Update GitHub workflows and Docker compose file (main)
  • Loading branch information
a-h-abdelsalam authored Nov 21, 2024
2 parents 7381876 + 9e3b184 commit f09a9ac
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .docker/compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: gsa-opensight-ui
name: gsa

services:
vulnerability-tests:
Expand Down Expand Up @@ -88,7 +88,7 @@ services:
condition: service_completed_successfully

gsa:
image: ghcr.io/greenbone/gsa:opensight-ui
image: ghcr.io/greenbone/gsa:edge
restart: on-failure
ports:
- 80:80
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ on:
push:
branches:
- main
- opensight-ui
- oldstable
pull_request:
branches:
- main
- opensight-ui
- oldstable

jobs:
testing:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ on:
push:
branches:
- main
tags: ['v*']
tags: ['v24.*']
pull_request:
branches:
- main
workflow_dispatch:
inputs:
ref-name:
type: string
description: 'The ref to build a container image from. For example a tag v23.0.0.'
description: 'The ref to build a container image from. For example a tag v24.0.0.'
required: true

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Build and Push to Greenbone Registry
on:
push:
branches: [ main ]
tags: ["v*"]
tags: ["v24*"]
pull_request:
branches: [ main ]
workflow_dispatch:
Expand Down

0 comments on commit f09a9ac

Please sign in to comment.