-
Notifications
You must be signed in to change notification settings - Fork 0
Add a new test to test linux-custom #113
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
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
8f741a1
🔧 add a new test to test a docker that are near our documentation
Lambourl d6f3614
🔧 add a new test with a custom rhel derivate
Lambourl 08eec98
🔧 fix typo in environment name
Lambourl a844bbf
🔧 fix patch error
Lambourl 59f6ca3
🔧 update environment
Lambourl 26c3e2b
🔧 add new toolchain in the environment
Lambourl File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 |
|---|---|---|
| @@ -1,32 +1,19 @@ | ||
| From e6f2f5c1372d1a8354e4dbe47e2bb6405bafb5f1 Mon Sep 17 00:00:00 2001 | ||
| From: "Damien Buhl (alias daminetreg)" <[email protected]> | ||
| Date: Tue, 17 Jun 2025 15:10:15 +0200 | ||
| Subject: [PATCH] :gear: temporarily FORCE new distro on old version + support | ||
| the build with the old version placeholder | ||
|
|
||
| This commit needs to be reverted on v0.0.73 release with support for tipi_cli_local_version | ||
| --- | ||
| linux-ubuntu-2404.pkr.js/linux-ubuntu-2404.Dockerfile | 6 ++++++ | ||
| linux-ubuntu-2404.pkr.js/linux-ubuntu-2404.pkr.js | 2 +- | ||
| 2 files changed, 7 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/linux-ubuntu-2404.pkr.js/linux-ubuntu-2404.Dockerfile b/linux-ubuntu-2404.pkr.js/linux-ubuntu-2404.Dockerfile | ||
| index d82ba8b..a33b06e 100644 | ||
| index 014ad79..ed0f259 100644 | ||
| --- a/linux-ubuntu-2404.pkr.js/linux-ubuntu-2404.Dockerfile | ||
| +++ b/linux-ubuntu-2404.pkr.js/linux-ubuntu-2404.Dockerfile | ||
| @@ -1,6 +1,12 @@ | ||
| ARG UBUNTU_24_04="ubuntu@sha256:04f510bf1f2528604dc2ff46b517dbdbb85c262d62eacc4aa4d3629783036096" | ||
| FROM ${UBUNTU_24_04} | ||
|
|
||
| +ENV TIPI_DISTRO_MODE=default | ||
| @@ -4,6 +4,11 @@ FROM ${UBUNTU_24_04} | ||
| ENV TIPI_DISTRO_MODE=all | ||
| ENV TIPI_INSTALL_LEGACY_PACKAGES=OFF | ||
| ENV TIPI_INSTALL_SOURCE=file:///tipi-linux-x86_64.zip | ||
| +ENV TIPI_DISTRO_JSON=https://raw.githubusercontent.com/tipi-build/distro/442a423e65f09ab0290609bc15f382585e89103e/distro.json | ||
| +ENV TIPI_DISTRO_JSON_SHA1=39ace975db0eb1f5a02318130fb425d21731ea5c | ||
| +RUN echo "TIPI_DISTRO_MODE=${TIPI_DISTRO_MODE}" >> /etc/environment | ||
| +RUN echo "TIPI_DISTRO_JSON=${TIPI_DISTRO_JSON}" >> /etc/environment | ||
| +RUN echo "TIPI_DISTRO_JSON_SHA1=${TIPI_DISTRO_JSON_SHA1}" >> /etc/environment | ||
| ENV TIPI_DISTRO_MODE=default | ||
| ENV TIPI_INSTALL_LEGACY_PACKAGES=OFF | ||
| ENV TIPI_INSTALL_SOURCE=file:///tipi-linux-x86_64.zip | ||
| COPY /tipi-linux-x86_64.zip . | ||
|
|
||
| ARG DEBIAN_FRONTEND=noninteractive # avoid tzdata asking for configuration | ||
| diff --git a/linux-ubuntu-2404.pkr.js/linux-ubuntu-2404.pkr.js b/linux-ubuntu-2404.pkr.js/linux-ubuntu-2404.pkr.js | ||
| index 2739cb0..45939c3 100644 | ||
| --- a/linux-ubuntu-2404.pkr.js/linux-ubuntu-2404.pkr.js | ||
|
|
@@ -35,11 +22,8 @@ index 2739cb0..45939c3 100644 | |
| "builders": [ | ||
| { | ||
| "type": "docker", | ||
| - "image": "tipibuild/tipi-ubuntu-2404:{{tipi_cli_local_version}}", | ||
| - "image": "tipibuild/tipi-ubuntu-2404:{{cmake_re_source_hash}}", | ||
| + "image": "tipibuild/tipi-ubuntu-2404:{{tipi_cli_version}}", | ||
| "commit": true | ||
| } | ||
| ], | ||
| -- | ||
| 2.39.2 (Apple Git-143) | ||
|
|
||
This file contains hidden or 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
29 changes: 29 additions & 0 deletions
29
install/container/0003-gear-temporarily-FORCE-new-distro-on-old-version-sup-custom.patch
This file contains hidden or 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,29 @@ | ||
| diff --git a/linux-custom.pkr.js/linux-custom.Dockerfile b/linux-custom.pkr.js/linux-custom.Dockerfile | ||
| index a72c3b1..54dd3d3 100644 | ||
| --- a/linux-custom.pkr.js/linux-custom.Dockerfile | ||
| +++ b/linux-custom.pkr.js/linux-custom.Dockerfile | ||
| @@ -4,6 +4,11 @@ FROM ${UBUNTU_24_04} | ||
| ENV TIPI_DISTRO_MODE=default | ||
| ENV TIPI_INSTALL_LEGACY_PACKAGES=OFF | ||
| ENV TIPI_INSTALL_SOURCE=file:///tipi-linux-x86_64.zip | ||
| +ENV TIPI_DISTRO_JSON=https://raw.githubusercontent.com/tipi-build/distro/442a423e65f09ab0290609bc15f382585e89103e/distro.json | ||
| +ENV TIPI_DISTRO_JSON_SHA1=39ace975db0eb1f5a02318130fb425d21731ea5c | ||
| +RUN echo "TIPI_DISTRO_MODE=${TIPI_DISTRO_MODE}" >> /etc/environment | ||
| +RUN echo "TIPI_DISTRO_JSON=${TIPI_DISTRO_JSON}" >> /etc/environment | ||
| +RUN echo "TIPI_DISTRO_JSON_SHA1=${TIPI_DISTRO_JSON_SHA1}" >> /etc/environment | ||
| COPY /tipi-linux-x86_64.zip . | ||
|
|
||
| ARG DEBIAN_FRONTEND=noninteractive # avoid tzdata asking for configuration | ||
| diff --git a/linux-custom.pkr.js/linux-custom.pkr.js b/linux-custom.pkr.js/linux-custom.pkr.js | ||
| index 7306ada..ce0e09e 100644 | ||
| --- a/linux-custom.pkr.js/linux-custom.pkr.js | ||
| +++ b/linux-custom.pkr.js/linux-custom.pkr.js | ||
| @@ -3,7 +3,7 @@ | ||
| "builders": [ | ||
| { | ||
| "type": "docker", | ||
| - "image": "linux-custom:{{cmake_re_source_hash}}", | ||
| + "image": "linux-custom:{{tipi_cli_version}}", | ||
| "commit": true | ||
| } | ||
| ], |
29 changes: 29 additions & 0 deletions
29
...l/container/0004-gear-temporarily-FORCE-new-distro-on-old-version-sup-custom-centos.patch
This file contains hidden or 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,29 @@ | ||
| diff --git a/linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95.Dockerfile b/linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95.Dockerfile | ||
| index 72fec18..0be1a8a 100644 | ||
| --- a/linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95.Dockerfile | ||
| +++ b/linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95.Dockerfile | ||
| @@ -6,6 +6,11 @@ ENV TIPI_DISTRO_MODE=default | ||
| ENV TIPI_INSTALL_LEGACY_PACKAGES=OFF | ||
| ENV SUDO_GROUP=wheel | ||
| ENV TIPI_INSTALL_SOURCE=file:///tipi-linux-x86_64.zip | ||
| +ENV TIPI_DISTRO_JSON=https://raw.githubusercontent.com/tipi-build/distro/442a423e65f09ab0290609bc15f382585e89103e/distro.json | ||
| +ENV TIPI_DISTRO_JSON_SHA1=39ace975db0eb1f5a02318130fb425d21731ea5c | ||
| +RUN echo "TIPI_DISTRO_MODE=${TIPI_DISTRO_MODE}" >> /etc/environment | ||
| +RUN echo "TIPI_DISTRO_JSON=${TIPI_DISTRO_JSON}" >> /etc/environment | ||
| +RUN echo "TIPI_DISTRO_JSON_SHA1=${TIPI_DISTRO_JSON_SHA1}" >> /etc/environment | ||
| COPY /tipi-linux-x86_64.zip . | ||
| RUN curl -fsSL https://raw.githubusercontent.com/tipi-build/cli/c14014db11342118f65ef95520a70f43c17ca453/install/container/centos.sh -o centos.sh && /bin/bash centos.sh | ||
|
|
||
| diff --git a/linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95.pkr.js b/linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95.pkr.js | ||
| index d12390f..e0c5679 100644 | ||
| --- a/linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95.pkr.js | ||
| +++ b/linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95.pkr.js | ||
| @@ -3,7 +3,7 @@ | ||
| "builders": [ | ||
| { | ||
| "type": "docker", | ||
| - "image": "linux-custom-almalinux-95:{{cmake_re_source_hash}}", | ||
| + "image": "linux-custom-almalinux-95:{{tipi_cli_version}}", | ||
| "commit": true | ||
| } | ||
| ], |
Submodule environments
updated
17 files
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.