-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into nvidia-support-core24
- Loading branch information
Showing
7 changed files
with
228 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| name: Bug Report | ||
| description: File a bug report | ||
| labels: "Bug" | ||
| body: | ||
| - type: markdown | ||
| attributes: | ||
| value: > | ||
| Thanks for taking the time to fill out this bug report! Before | ||
| submitting your issue, make sure this has not been already | ||
| reported or if it works with the latest published version | ||
| of Docker snap. | ||
| - type: textarea | ||
| id: bug-description | ||
| attributes: | ||
| label: Bug description | ||
| description: > | ||
| If applicable, add screenshots to help explain your problem. | ||
| validations: | ||
| required: true | ||
|
|
||
| - type: textarea | ||
| id: reproduction | ||
| attributes: | ||
| label: To reproduce | ||
| description: > | ||
| Provide a step-by-step instruction on how to reproduce the behavior. | ||
| validations: | ||
| required: true | ||
|
|
||
| - type: textarea | ||
| id: environment | ||
| attributes: | ||
| label: Environment information for bug reproduction | ||
| description: > | ||
| Kindly copy **all** the commands below, run them in your terminal, | ||
| and share the results here. | ||
| ```bash | ||
| echo -e "\nDocker snap information:" | ||
| snap list docker | ||
| echo -e "\nPlug Connections:" | ||
| snap connections docker | ||
| echo -e "\nSnapd information:" | ||
| snap version | ||
| echo -e "\nOS release:" | ||
| cat /etc/os-release | ||
| echo -e "\nKernel and architecture:" | ||
| uname -rvm | ||
| ``` | ||
| render: shell | ||
| validations: | ||
| required: true | ||
|
|
||
| - type: textarea | ||
| id: logs | ||
| attributes: | ||
| label: Additional information | ||
| description: > | ||
| Provide any additional information, including relevant logs. | ||
| validations: | ||
| required: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| blank_issues_enabled: false | ||
| contact_links: | ||
| - name: Docker snap discussions | ||
| url: https://github.com/canonical/docker-snap/discussions | ||
| about: Questions regarding Docker snap usage |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| name: Task | ||
| description: File an enhancement proposal | ||
| labels: "Enhancement" | ||
| body: | ||
| - type: markdown | ||
| attributes: | ||
| value: > | ||
| Thanks for taking the time to fill out this enhancement | ||
| proposal! Before submitting your issue, please make sure there | ||
| isn't already a prior issue concerning this. If there is, | ||
| please join that discussion instead. | ||
| - type: textarea | ||
| id: enhancement-proposal-what | ||
| attributes: | ||
| label: What needs to get done | ||
| validations: | ||
| required: true | ||
|
|
||
| - type: textarea | ||
| id: enhancement-proposal-why | ||
| attributes: | ||
| label: Why it needs to get done | ||
| validations: | ||
| required: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -eux | ||
|
|
||
| fetch_latest() { | ||
| # Fetch latest version from Github releases API | ||
| LATEST=$(curl -s "https://api.github.com/repos/moby/moby/releases?per_page=1" | jq -r '.[0].tag_name') | ||
| } | ||
|
|
||
| # Validate the version format | ||
| validate_version() { | ||
| # Original simplified RegEx: | ||
| # v\d+.\d+.\d+\-*(rc.\d|rc\d|beta.\d)* | ||
| # By analysing the last tags on github.com/moby/moby/tags | ||
| # of last 3 years (since 2021). | ||
| if [[ "$LATEST" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]|rc[0-9]|beta\.[0-9])?$ ]]; then | ||
| echo "$LATEST matches the regex." | ||
| else | ||
| echo "Version doesn't match known pattern." | ||
| exit 1 | ||
| fi | ||
| } | ||
|
|
||
| check_yq() { | ||
| if ! command -v yq &>/dev/null; then | ||
| echo -e "yq is not installed." | ||
| echo -e "Please run:" | ||
| echo -e "\tsudo snap install yq" | ||
| exit 1 | ||
| fi | ||
| } | ||
|
|
||
| check_new_version() { | ||
| if [[ "$CURRENT" == "$LATEST" ]]; then | ||
| echo -e "Docker snap is already updated\n" | ||
| exit 0 | ||
| fi | ||
| } | ||
|
|
||
| main() { | ||
| check_yq | ||
|
|
||
| # Define the path to the YAML file | ||
| yaml_file="snap/snapcraft.yaml" | ||
|
|
||
| CURRENT=$(yq e '.parts.engine.source-tag' "$yaml_file") | ||
|
|
||
| fetch_latest | ||
|
|
||
| echo "Latest TAG: $LATEST" | ||
|
|
||
| validate_version | ||
|
|
||
| check_new_version | ||
|
|
||
| SNAP_VERSION=${LATEST#v} | ||
| echo -e "New snap version $SNAP_VERSION" | ||
|
|
||
| echo "The latest version of moby is: $LATEST" | ||
|
|
||
| # Fetch the Dockerfile | ||
| dockerfile=$(curl -s "https://raw.githubusercontent.com/moby/moby/refs/tags/$LATEST/Dockerfile") | ||
|
|
||
| # Declare variables and their corresponding regex patterns | ||
| declare -A variables=( | ||
| [GO_VERSION]='^ARG GO_VERSION=' | ||
| [CONTAINERD_VERSION]='^ARG CONTAINERD_VERSION=' | ||
| [RUNC_VERSION]='^ARG RUNC_VERSION=' | ||
| [TINI_VERSION]='^ARG TINI_VERSION=' | ||
| [DOCKERCLI_VERSION]='^ARG DOCKERCLI_VERSION=' | ||
| [BUILDX_VERSION]='^ARG BUILDX_VERSION=' | ||
| [COMPOSE_VERSION]='^ARG COMPOSE_VERSION=' | ||
| ) | ||
|
|
||
| # Extract versions using a loop | ||
| for var in "${!variables[@]}"; do | ||
| value=$(echo "$dockerfile" | awk -F= "/${variables[$var]}/ {print \$2}") | ||
|
|
||
| # Handle special cases: GO_VERSION and BUILDX_VERSION | ||
| if [[ "$var" == "GO_VERSION" ]]; then | ||
| # for GO_VERSION Extract major.minor | ||
| value=$(echo "$value" | awk -F. '{print $1 "." $2}') | ||
| elif [[ "$var" == "BUILDX_VERSION" && $value != v* ]]; then | ||
| value="v$value" # Prepend 'v' if missing | ||
| fi | ||
|
|
||
| declare "$var=$value" | ||
| echo "$var: ${!var}" | ||
| done | ||
|
|
||
| # Replace the `version:` field with the value of $SNAP_VERSION | ||
| yq -i ".version = \"$SNAP_VERSION\"" "$yaml_file" | ||
|
|
||
| # Replace fields in YAML using a loop | ||
| declare -A yaml_updates=( | ||
| [engine.source-tag]=$LATEST | ||
| [containerd.source-tag]=$CONTAINERD_VERSION | ||
| [runc.source-tag]=$RUNC_VERSION | ||
| [tini.source-tag]=$TINI_VERSION | ||
| [docker-cli.source-tag]=$DOCKERCLI_VERSION | ||
| [buildx.source-tag]=$BUILDX_VERSION | ||
| [compose-v2.source-tag]=$COMPOSE_VERSION | ||
| ) | ||
|
|
||
| for part in "${!yaml_updates[@]}"; do | ||
| yq -i ".parts.${part} = \"${yaml_updates[$part]}\"" "$yaml_file" | ||
| done | ||
|
|
||
| # Replace `build-snaps` for `engine` with $GO_VERSION | ||
| yq -i '.parts.engine."build-snaps"[0] |= sub("[0-9]+\.[0-9]+", "'"$GO_VERSION"'")' "$yaml_file" | ||
|
|
||
| # Replace the remaining comments | ||
| sed -i "s/$CURRENT/$LATEST/g" "$yaml_file" | ||
|
|
||
| echo "YAML file updated successfully." | ||
|
|
||
| } | ||
|
|
||
| main |