diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 9b70a39..87e43ef 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -29,7 +29,7 @@ jobs: echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY echo "> External trigger running off of nightly branch. To disable this trigger, add \`mylar3_nightly\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY - EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/mylar3/mylar3/commits/python3-dev" | jq -r '. | .sha' | cut -c1-8) + EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/mylar3/mylar3/commits/1000papercuts" | jq -r '. | .sha' | cut -c1-8) echo "Type is \`github_commit\`" >> $GITHUB_STEP_SUMMARY if grep -q "^mylar3_nightly_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY diff --git a/Dockerfile b/Dockerfile index 9ccfeef..469a389 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,7 @@ RUN \ zlib1g-dev && \ echo "**** install mylar3 ****" && \ if [ -z ${MYLAR3_RELEASE+x} ]; then \ - MYLAR3_RELEASE=$(curl -sX GET https://api.github.com/repos/mylar3/mylar3/commits/python3-dev \ + MYLAR3_RELEASE=$(curl -sX GET https://api.github.com/repos/mylar3/mylar3/commits/1000papercuts \ | jq -r '.sha' | cut -c1-8); \ fi && \ mkdir /app/mylar3 && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 8225221..6e0199d 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -32,7 +32,7 @@ RUN \ zlib1g-dev && \ echo "**** install mylar3 ****" && \ if [ -z ${MYLAR3_RELEASE+x} ]; then \ - MYLAR3_RELEASE=$(curl -sX GET https://api.github.com/repos/mylar3/mylar3/commits/python3-dev \ + MYLAR3_RELEASE=$(curl -sX GET https://api.github.com/repos/mylar3/mylar3/commits/1000papercuts \ | jq -r '.sha' | cut -c1-8); \ fi && \ mkdir /app/mylar3 && \ diff --git a/Jenkinsfile b/Jenkinsfile index 87c651f..d54f22f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,7 +19,7 @@ pipeline { DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat') QUAYIO_API_TOKEN=credentials('quayio-repo-api-token') GIT_SIGNING_KEY=credentials('484fbca6-9a4f-455e-b9e3-97ac98785f5f') - EXT_GIT_BRANCH = 'python3-dev' + EXT_GIT_BRANCH = '1000papercuts' EXT_USER = 'mylar3' EXT_REPO = 'mylar3' BUILD_VERSION_ARG = 'MYLAR3_RELEASE' diff --git a/README.md b/README.md index 84a6691..89a5f08 100644 --- a/README.md +++ b/README.md @@ -60,9 +60,9 @@ This image provides various versions that are available via tags. Please read th | Tag | Available | Description | | :----: | :----: |--- | -| latest | ✅ | Stable Mylar3 releases | -| nightly | ✅ | Commits to Mylar3 `python3-dev` branch | -| unstable | ✅ | Commits to Mylar3 `1000papercuts` branch | +| latest | ✅ | Commits to Mylar3 `python3-dev` branch | +| nightly | ✅ | Commits to Mylar3 `1000papercuts` branch (ubuntu) | +| unstable | ✅ | Commits to Mylar3 `1000papercuts` branch (alpine) | ## Application Setup @@ -289,6 +289,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **19.02.26:** - Rebase `nightly` tag to build commits from upstream `1000papercuts` branch. * **05.02.26:** - Release `unstable` tag based on commits to upstream `1000papercuts` branch. * **10.11.25:** - Rebase to Ubuntu Jammy. * **23.12.23:** - Rebase to Alpine 3.19. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 69b7eea..1418d35 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -7,7 +7,7 @@ release_type: prerelease release_tag: nightly ls_branch: nightly repo_vars: - - EXT_GIT_BRANCH = 'python3-dev' + - EXT_GIT_BRANCH = '1000papercuts' - EXT_USER = 'mylar3' - EXT_REPO = 'mylar3' - BUILD_VERSION_ARG = 'MYLAR3_RELEASE' diff --git a/readme-vars.yml b/readme-vars.yml index f0870d9..9055ea2 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -13,9 +13,9 @@ available_architectures: # development version development_versions: true development_versions_items: - - {tag: "latest", desc: "Stable Mylar3 releases"} - - {tag: "nightly", desc: "Commits to Mylar3 `python3-dev` branch"} - - {tag: "unstable", desc: "Commits to Mylar3 `1000papercuts` branch"} + - {tag: "latest", desc: "Commits to Mylar3 `python3-dev` branch"} + - {tag: "nightly", desc: "Commits to Mylar3 `1000papercuts` branch (ubuntu)"} + - {tag: "unstable", desc: "Commits to Mylar3 `1000papercuts` branch (alpine)"} # container parameters param_container_name: "{{ project_name }}" param_usage_include_vols: true @@ -79,6 +79,7 @@ init_diagram: | "mylar3:nightly" <- Base Images # changelog changelogs: + - {date: "19.02.26:", desc: "Rebase `nightly` tag to build commits from upstream `1000papercuts` branch."} - {date: "05.02.26:", desc: "Release `unstable` tag based on commits to upstream `1000papercuts` branch."} - {date: "10.11.25:", desc: "Rebase to Ubuntu Jammy."} - {date: "23.12.23:", desc: "Rebase to Alpine 3.19."}