Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions .github/workflows/containers-push-upstream-to-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,15 @@ jobs:
fail-fast: false
matrix:
image:
- name: postgrest/postgrest:v12.2.12
- name: postgrest/postgrest
short-name: postgrest
- name: ghcr.io/gsa-tts/clamav-rest/clamav:latest
tag: v12.2.12
- name: ghcr.io/gsa-tts/clamav-rest/clamav
short-name: clamav
- name: metabase/metabase:v0.63.16.7
tag: latest
- name: metabase/metabase
short-name: metabase
tag: v0.64.3

steps:
- name: Checkout
Expand All @@ -33,7 +36,7 @@ jobs:
uses: docker/setup-buildx-action@v4

- name: Pull Docker Image
run: docker pull ${{ matrix.image.name }}
run: docker pull ${{ matrix.image.name }}:${{ matrix.image.tag}}

- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0
Expand All @@ -44,7 +47,7 @@ jobs:
TRIVY_SKIP_JAVA_DB_UPDATE: true
TRIVY_DISABLE_VEX_NOTICE: true
with:
image-ref: '${{ matrix.image.name }}'
image-ref: '${{ matrix.image.name }}:${{ matrix.image.tag}}'
scan-type: 'image'
hide-progress: false
exit-code: 1
Expand All @@ -57,8 +60,9 @@ jobs:
- name: Tag Image
run: |
date=$(date +%Y%m%d)
docker tag ${{ matrix.image.name }} ghcr.io/${{ env.GH_REPO }}/${{ matrix.image.short-name }}:latest
docker tag ${{ matrix.image.name }} ghcr.io/${{ env.GH_REPO }}/${{ matrix.image.short-name }}:$date
docker tag ${{ matrix.image.name }}:${{ matrix.image.tag}} ghcr.io/${{ env.GH_REPO }}/${{ matrix.image.short-name }}:latest
docker tag ${{ matrix.image.name }}:${{ matrix.image.tag}} ghcr.io/${{ env.GH_REPO }}/${{ matrix.image.short-name }}:$date
docker tag ${{ matrix.image.name }}:${{ matrix.image.tag}} ghcr.io/${{ env.GH_REPO }}/${{ matrix.image.short-name }}:${{ matrix.image.tag}}

- name: Login to GitHub Container Registry
uses: docker/login-action@v4.6.0
Expand Down
2 changes: 1 addition & 1 deletion backend/docker-compose.metabase.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
# Metabase app
#---------------------------------------------
metabase:
image: metabase/metabase:v0.63.16.7
image: ghcr.io/gsa-tts/fac/metabase:latest
container_name: metabase
hostname: metabase
volumes:
Expand Down
2 changes: 1 addition & 1 deletion terraform/shared/modules/env/autoscaler.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ resource "cloudfoundry_service_instance" "app_autoscaler" {
scaling_rules = [
{
metric_type = "memoryused"
threshold = 3000 # 3GBs , scale down at 75% usage for instances with 4GB of memory
threshold = 3000 # 3GBs , scale up at 75% usage for instances with 4GB of memory
operator = ">="
adjustment = "+1"
breach_duration_secs = 60
Expand Down
2 changes: 1 addition & 1 deletion terraform/shared/modules/metabase/metabase.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ data "cloudfoundry_space" "app_space" {
}

data "docker_registry_image" "metabase" {
name = "ghcr.io/gsa-tts/fac/metabase:latest"
name = "ghcr.io/gsa-tts/fac/metabase:v0.64.3"
}

resource "cloudfoundry_route" "app_route" {
Expand Down
Loading