Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Erin update ga #1153

Merged
merged 3 commits into from
Dec 27, 2024
Merged
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
8 changes: 4 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ Please replace all '[ ]' with '[X]' to demonstrate completion.

Pull Request (PR) checklist:
- [ ] Include a description of what is in this pull request in this message.
- [ ] The dockerfile successfully builds to a test target for the user creating the PR. (i.e. `docker build --tag samtools:1.15test --target test docker-builds/samtools/1.15` )
- [ ] Directory structure as name of the tool in lower case with special characters removed with a subdirectory of the version number (i.e. `spades/3.12.0/Dockerfile`)
- [ ] (optional) All test files are located in same directory as the Dockerfile (i.e. `shigatyper/2.0.1/test.sh`)
- [ ] Create a simple container-specific [README.md](https://github.com/StaPH-B/docker-builds/blob/master/.github/workflow-templates/readme-template.md) in the same directory as the Dockerfile (i.e. `spades/3.12.0/README.md`)
- [ ] The dockerfile successfully builds to a test target for the user creating the PR. (i.e. `docker build --tag samtools:1.15test --target test docker-builds/build-files/samtools/1.15` )
- [ ] Directory structure as name of the tool in lower case with special characters removed with a subdirectory of the version number in build-files (i.e. `docker-builds/build-files/spades/3.12.0/Dockerfile`)
- [ ] (optional) All test files are located in same directory as the Dockerfile (i.e. `build-files/shigatyper/2.0.1/test.sh`)
- [ ] Create a simple container-specific [README.md](https://github.com/StaPH-B/docker-builds/blob/master/.github/workflow-templates/readme-template.md) in the same directory as the Dockerfile (i.e. `docker-builds/build-files/spades/3.12.0/README.md`)
- [ ] If this README is longer than 30 lines, there is an explanation as to why more detail was needed
- [ ] Dockerfile includes the recommended [LABELS](https://github.com/StaPH-B/docker-builds/blob/master/dockerfile-template/Dockerfile#L8-L18)
- [ ] Main [README.md](https://github.com/StaPH-B/docker-builds/blob/master/README.md) has been updated to include the tool and/or version of the dockerfile(s) in this PR
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/manual-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ on:
workflow_dispatch:
inputs:
tool:
description: "Tool to deploy. Must match filepath: /<tool>/version/Dockerfile"
description: "Tool to deploy. Must match filepath: build-files/<tool>/version/Dockerfile"
required: true
version:
description: "Version to deploy. Must match filepath: /tool/<version>/Dockerfile"
description: "Version to deploy. Must match filepath: build-files/tool/<version>/Dockerfile"
required: true
docker_image_tag:
description: "Docker image tag to use: repository/tool:<tag> (Match version unless you require a custom tag)"
required: true
push_quay:
description: "Deploy to Quay too? (repository must first exist on quay)"
description: "Deploy to Quay too?"
type: boolean
default: true
push_latest_tag:
Expand All @@ -38,7 +38,7 @@ jobs:
build-to-test:
uses: ./.github/workflows/build-to-test.yml
with:
path_to_context: "./${{ github.event.inputs.tool }}/${{ github.event.inputs.version }}"
path_to_context: "./build-files/${{ github.event.inputs.tool }}/${{ github.event.inputs.version }}"
cache: ${{ github.event.inputs.tool }}

# This job calls a workflow to build the image to the 'app' stage and pushes the image to Docker Hub
Expand All @@ -51,7 +51,7 @@ jobs:
quay_username: ${{ secrets.quay_username }}
quay_robot_token: ${{ secrets.quay_robot_token }}
with:
path_to_context: "./${{ github.event.inputs.tool }}/${{ github.event.inputs.version }}"
path_to_context: "./build-files/${{ github.event.inputs.tool }}/${{ github.event.inputs.version }}"
repository_name: ${{ github.event.inputs.repository_name }}
cache: ${{ github.event.inputs.tool }}
container_name: ${{ github.event.inputs.tool }}
Expand Down
Loading