Skip to content

Commit 037b97d

Browse files
dervoetinightkr
dervoeti
and
nightkr
authored
feat: patchable init mirroring (#1070)
* feat: support forking when initializing * fix: don't use fetchhead / update libgit / migrate patchable.toml files * chore: replace "forking" with "mirroring" * feat: keep original upstream / anonymous remote * refactor: move progress tracking setup into utils function * feat: always use tags in our mirror repos * Update rust/patchable/src/main.rs Co-authored-by: Natalie Klestrup Röijezon <[email protected]> * Update rust/patchable/src/main.rs Co-authored-by: Natalie Klestrup Röijezon <[email protected]> * Update rust/patchable/src/main.rs Co-authored-by: Natalie Klestrup Röijezon <[email protected]> * Update rust/patchable/src/main.rs Co-authored-by: Natalie Klestrup Röijezon <[email protected]> * Update rust/patchable/src/main.rs Co-authored-by: Natalie Klestrup Röijezon <[email protected]> * Update rust/patchable/src/main.rs Co-authored-by: Natalie Klestrup Röijezon <[email protected]> * fix: span behaviour / mirror flag * feat: separate product level configuration * refactor: separate product and version config * fix: adjust README * chore: formatting / unnecessary clone * fix: tracing * fix: readme adjustment * Make mirroring optional again * feat: ssh support * feat: remove url crate * docs: update README * Update rust/patchable/src/main.rs Co-authored-by: Natalie Klestrup Röijezon <[email protected]> * feat: product-level configs for patchable * docs: fixed README.md for markdownlint * chore: removed upstream from version configs / added missing product-level configs * fix: copy complete patches directories to include patchable product config * Revert "fix: copy complete patches directories to include patchable product config" This reverts commit 6148608. * fix: copy patchable product config as well --------- Co-authored-by: Natalie Klestrup Röijezon <[email protected]>
1 parent ab96aea commit 037b97d

File tree

68 files changed

+327
-83
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+327
-83
lines changed

‎Cargo.lock‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ resolver = "2"
44

55
[workspace.dependencies]
66
clap = { version = "4.5.27", features = ["derive"] }
7-
git2 = "0.20.0"
7+
git2 = "0.20.1"
88
serde = { version = "1.0.217", features = ["derive"] }
99
snafu = "0.8.5"
1010
tempfile = "3.16.0"

‎druid/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ EOF
3232
USER ${STACKABLE_USER_UID}
3333
WORKDIR /stackable
3434

35+
COPY --chown=${STACKABLE_USER_UID}:0 druid/stackable/patches/patchable.toml /stackable/src/druid/stackable/patches/patchable.toml
3536
COPY --chown=${STACKABLE_USER_UID}:0 druid/stackable/patches/${PRODUCT} /stackable/src/druid/stackable/patches/${PRODUCT}
3637

3738
# Cache mounts are owned by root by default

‎druid/stackable/patches/30.0.0/patchable.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
upstream = "https://github.com/apache/druid.git"
21
base = "09d36ee324747f1407705c27618b6d415c3fa8a9"
2+
mirror = "https://github.com/stackabletech/druid.git"

‎druid/stackable/patches/30.0.1/patchable.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
upstream = "https://github.com/apache/druid.git"
21
base = "a30af7a91d528e5c3a90356a5592abc7119191c6"
2+
mirror = "https://github.com/stackabletech/druid.git"

‎druid/stackable/patches/31.0.1/patchable.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
upstream = "https://github.com/apache/druid.git"
21
base = "520482cb9638e452b0553595b4f29bb397a63758"
2+
mirror = "https://github.com/stackabletech/druid.git"

‎druid/stackable/patches/patchable.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
upstream = "https://github.com/apache/druid.git"
2+
default-mirror = "https://github.com/stackabletech/druid.git"

‎hadoop/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ ln -s "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar" /stackable/j
5151
EOF
5252

5353
WORKDIR /build
54+
COPY --chown=${STACKABLE_USER_UID}:0 hadoop/stackable/patches/patchable.toml /build/src/hadoop/stackable/patches/patchable.toml
5455
COPY --chown=${STACKABLE_USER_UID}:0 hadoop/stackable/patches/${PRODUCT} /build/src/hadoop/stackable/patches/${PRODUCT}
5556
COPY --chown=${STACKABLE_USER_UID}:0 hadoop/stackable/fuse_dfs_wrapper /build
5657
COPY --chown=${STACKABLE_USER_UID}:0 hadoop/stackable/jmx /stackable/jmx

‎hadoop/stackable/patches/3.3.4/patchable.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
upstream = "https://github.com/apache/hadoop.git"
21
base = "a585a73c3e02ac62350c136643a5e7f6095a3dbb"
2+
mirror = "https://github.com/stackabletech/hadoop.git"

‎hadoop/stackable/patches/3.3.6/patchable.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
upstream = "https://github.com/apache/hadoop.git"
21
base = "1be78238728da9266a4f88195058f08fd012bf9c"
2+
mirror = "https://github.com/stackabletech/hadoop.git"

0 commit comments

Comments
 (0)