Skip to content

Commit

Permalink
Version updates and tidying
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelpnelson committed Dec 2, 2024
1 parent 323ef97 commit 0478e1e
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ jobs:

name: Build BCDC-SMK container image
# The type of runner that the job will run on
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
outputs:
dockerversiontag: ${{ steps.calculateImageTag.outputs.DOCKER_VERSION_TAG }}
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v4
id: checkout
with:
# Disabling shallow clone is recommended for improving relevancy of reporting
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
# --------- CACHE THE IMAGE TAG and ISSUE URL IN AN ARTIFACT
- name: upload image tag
id: uploadimagetag
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: imagetag
path: |
Expand All @@ -74,7 +74,7 @@ jobs:
- name: Create the docker image
uses: docker/build-push-action@v1
with:
registry: docker.pkg.github.com
registry: ghcr.io
username: $GITHUB_ACTOR
password: ${{ secrets.GITHUB_TOKEN }}
repository: bcgov/bcdc-smk/bcdc-smk
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/devdeploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
defaults:
run:
shell: bash
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
outputs:
dockerversiontag: ${{ steps.retrieveimagetag.outputs.DOCKER_VERSION_TAG }}
issue_url: ${{ steps.retrieveimagetag.outputs.ISSUE_URL }}
Expand All @@ -22,7 +22,7 @@ jobs:
steps:
# Checking out code to get access to the openshift deploy template later on
# could also reference the github url?
- uses: actions/checkout@v2
- uses: actions/checkout@v4
id: checkout
with:
fetch-depth: 0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prddeploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ jobs:
defaults:
run:
shell: bash
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
outputs:
dockerversiontag: ${{ steps.retrieveimagetag.outputs.DOCKER_VERSION_TAG }}

steps:

# CHECKOUT THE CODE
- uses: actions/checkout@v2
- uses: actions/checkout@v4
id: checkout
with:
fetch-depth: 0
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@ dist
# TernJS port file
.tern-port

# IDE files
.vscode

openshift/junk.js
openshift/jenkins_etltools_deployconfig.yaml
openshift/jenkins_bcdctools_deployconfig.yaml
Expand Down
2 changes: 1 addition & 1 deletion openshift/deployTemplate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ parameters:
value: dev
- name: "CONTAINER_SRC"
description: "path to the container/image stream"
value: docker.pkg.github.com/bcgov/bcdc-smk/bcdc-smk
value: ghcr.io/bcgov/bcdc-smk/bcdc-smk
- name: "CONTAINER_SRC_SECRET_NAME"
description: "name of the secret that is used to retrieve the container, require by github hosted packages (images)"
value: bcdcsmk-image-secret
Expand Down
2 changes: 1 addition & 1 deletion openshift/flow.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ repository: https://github.com/bcgov/bcdc-smk
* type: Image Secret
* secret name: bcdcsmk-image-secret
* Authentication: Image Registry Credentials
* Image Registry Server Address: docker.pkg.github.com/bcgov/bcdc-smk/bcdc-smk
* Image Registry Server Address: ghcr.io/bcgov/bcdc-smk/bcdc-smk


#### Create a service account
Expand Down

0 comments on commit 0478e1e

Please sign in to comment.