diff --git a/.github/workflows/apply.yml b/.github/workflows/apply.yml index 52bacf4..56707fc 100644 --- a/.github/workflows/apply.yml +++ b/.github/workflows/apply.yml @@ -17,7 +17,7 @@ jobs: packages: write steps: - name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 + uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4 - name: Install Terraform uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3 @@ -25,13 +25,13 @@ jobs: terraform_version: 1.5.7 - name: Set up Cloud SDK - uses: google-github-actions/setup-gcloud@6189d56e4096ee891640bb02ac264be376592d6a # v2 + uses: google-github-actions/setup-gcloud@e427ad8a34f8676edf47cf7d7925499adf3eb74f # v2 with: version: "latest" - name: Authenticate to Google Cloud id: "auth" - uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2 + uses: google-github-actions/auth@c200f3691d83b41bf9bbd8638997a462592937ed # v2 with: workload_identity_provider: ${{ secrets.GCLOUD_OIDC_POOL }} service_account: ${{ secrets.GSA }} @@ -43,7 +43,7 @@ jobs: gcloud config set disable_prompts true - name: "GAR login" - uses: "docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772" # v3 + uses: "docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1" # v3 with: registry: "us-docker.pkg.dev" username: "oauth2accesstoken" diff --git a/.github/workflows/plan.yml b/.github/workflows/plan.yml index 4942bc1..491b886 100644 --- a/.github/workflows/plan.yml +++ b/.github/workflows/plan.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 + uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4 - name: Install Terraform uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3 @@ -29,13 +29,13 @@ jobs: shell: bash - name: Set up Cloud SDK - uses: google-github-actions/setup-gcloud@6189d56e4096ee891640bb02ac264be376592d6a # v2 + uses: google-github-actions/setup-gcloud@e427ad8a34f8676edf47cf7d7925499adf3eb74f # v2 with: version: 'latest' - name: Authenticate to Google Cloud id: 'auth' - uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2 + uses: google-github-actions/auth@c200f3691d83b41bf9bbd8638997a462592937ed # v2 with: workload_identity_provider: ${{ secrets.GCLOUD_OIDC_POOL }} service_account: ${{ secrets.GSA }} @@ -67,7 +67,7 @@ jobs: continue-on-error: true - name: Post comment with Terraform plan - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7 + uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7 with: github-token: ${{ secrets.GITHUB_TOKEN }} script: | diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index 5e52b3b..54da244 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -13,11 +13,11 @@ jobs: contents: read steps: - name: checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 + uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4 - name: Authenticate to Google Cloud id: 'auth' - uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2 + uses: google-github-actions/auth@c200f3691d83b41bf9bbd8638997a462592937ed # v2 with: workload_identity_provider: ${{ secrets.GCLOUD_OIDC_POOL }} service_account: ${{ secrets.GSA }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6eb8e05..9cb8427 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 + uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4 - name: Install Terraform uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3 @@ -29,13 +29,13 @@ jobs: shell: bash - name: Set up Cloud SDK - uses: google-github-actions/setup-gcloud@6189d56e4096ee891640bb02ac264be376592d6a # v2 + uses: google-github-actions/setup-gcloud@e427ad8a34f8676edf47cf7d7925499adf3eb74f # v2 with: version: 'latest' - name: Authenticate to Google Cloud id: 'auth' - uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2 + uses: google-github-actions/auth@c200f3691d83b41bf9bbd8638997a462592937ed # v2 with: workload_identity_provider: ${{ secrets.GCLOUD_OIDC_POOL }} service_account: ${{ secrets.GSA }} diff --git a/Dockerfile b/Dockerfile index 76504d6..1227907 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ollama/ollama:0.11.4@sha256:be17b353bf3cfab0b6980530284e64716a57589ed753a82d9a6a2a5fa9a61a31 +FROM ollama/ollama:0.11.10@sha256:a5409cb903d30f9cd67e9f430dd336ddc9274e16fd78f75b675c42065991b4fd ENV \ OLLAMA_HOST=0.0.0.0:8080 \ diff --git a/main.tf b/main.tf index 9c1dc54..98fb095 100644 --- a/main.tf +++ b/main.tf @@ -7,11 +7,11 @@ terraform { } google = { source = "hashicorp/google" - version = "6.47.0" + version = "6.49.3" } google-beta = { source = "hashicorp/google-beta" - version = "6.47.0" + version = "6.49.3" } } @@ -182,7 +182,7 @@ module "fits" { containers = tolist([ { name = "fits", - image = "islandora/fits:main@sha256:698971c83dfc7afd98926486700bb951498246503ca26bc8e7c3174d0e3df066" + image = "islandora/fits:main@sha256:63e770d6e58ff79c936dcaaed3c69f6aaa2aa046dff83f264aaebdcce34f4955" memory = "8Gi" cpu = "2000m" } diff --git a/modules/cloudrun-v2/main.tf b/modules/cloudrun-v2/main.tf index 7920ac1..b57f1c7 100644 --- a/modules/cloudrun-v2/main.tf +++ b/modules/cloudrun-v2/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { google-beta = { source = "hashicorp/google-beta" - version = "6.47.0" + version = "6.49.3" } } } diff --git a/modules/cloudrun/main.tf b/modules/cloudrun/main.tf index eb69a9e..d9c34ff 100644 --- a/modules/cloudrun/main.tf +++ b/modules/cloudrun/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = "6.47.0" + version = "6.49.3" } } } diff --git a/test/main.tf b/test/main.tf index 98e1e92..18e83db 100644 --- a/test/main.tf +++ b/test/main.tf @@ -7,7 +7,7 @@ terraform { } google = { source = "hashicorp/google" - version = "6.47.0" + version = "6.49.3" } } @@ -112,7 +112,7 @@ module "fits" { containers = tolist([ { name = "fits", - image = "islandora/fits:main@sha256:698971c83dfc7afd98926486700bb951498246503ca26bc8e7c3174d0e3df066" + image = "islandora/fits:main@sha256:63e770d6e58ff79c936dcaaed3c69f6aaa2aa046dff83f264aaebdcce34f4955" memory = "8Gi" cpu = "2000m" }