Add support for Alpine to `git` feature #1008

jonbackhaus · 2024-06-19T02:11:32Z

This PR introduces support of Alpine Linux to the git dev container feature.

the alpine version of `grep` doesn't support PCRE

note: this won't install from source (due to build issues with musl) but will install using the `apk` package manager

jonbackhaus · 2024-06-19T02:12:24Z

@jonbackhaus please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.
@microsoft-github-policy-service agree [company="{your company}"]
Options:

(default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
@microsoft-github-policy-service agree
(when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
@microsoft-github-policy-service agree company="Microsoft"
Contributor License Agreement

@microsoft-github-policy-service agree

samruddhikhandale

Thank you for taking the time in contributing the support for Alpine. Left some comments!

src/git/install.sh

note: feature does not currently implement building from source on Alpine

src/git/NOTES.md

still need to tweak the package dependencies and make config

no longer required with "NO_GETTEXT=YesPlease" make config

no longer required with "NO_GETTEXT=YesPlease" make config (?)

samruddhikhandale

Looks like we have failing tests and builds, can you help fix them? Thanks!

…g elements

…talled); refactor test script names to remove major version suffix (since it isn't specified in the associated image tag)

src/git/install.sh

test/git/install_git_from_src_alpine.sh

src/git/install.sh

using `jq` avoids the need for PCRE `grep` expression (not supported in Alpine)

see [devcontainers#395](devcontainers#395)

…rom `install_git_from_src.sh` script

… builds see [devcontainers#395](devcontainers#395)

… in Alpine)

…e` image

not present in local Git feature in `base-alpine` image `install.sh` script

…it feature in `base-alpine` image

…se-alpine` image no longer needed, based on initial testing

…al Git feature in `base-alpine` image `jq` package no longer needed

…_src.sh`)

…e system package is not built with PCRE support)

samruddhikhandale

Wonderful, thank you so much 🎉

h3xcat · 2024-06-28T18:50:18Z

Looks like tests are failing for alpine

jonbackhaus added 11 commits June 18, 2024 21:06

feat: add basic scaffolding for alpine, based on debian implementation

67c8c0b

feat: add baseline packages from <https://github.com/alpinelinux/apor…

bc2f246

…ts/blob/master/main/git/APKBUILD>

fix: add curl package (needed for version lookup)

a3ed71e

feat: use jq-based version matching implementation for alpine

8a9fca3

the alpine version of `grep` doesn't support PCRE

fix: forgot to strip the leading "v" from the version number

6a1fbcc

fix: need make package to build from source

5251ab7

feat: parameterize make options to easily inject Alpine-specific option

82e3b70

fix: wip: latest baseline (still breaking due to musl)

661799b

feat: add basic scaffolding for alpine, based on debian implementation

d87433b

note: this won't install from source (due to build issues with musl) but will install using the `apk` package manager

chore: chmod +x

b8b3395

chore: bump semver (proposed)

accbf41

jonbackhaus requested a review from a team as a code owner June 19, 2024 02:11

Merge branch 'main' into git-alpine

4407a4d

samruddhikhandale requested changes Jun 19, 2024

View reviewed changes

src/git/install.sh Show resolved Hide resolved

src/git/install.sh Show resolved Hide resolved

jonbackhaus and others added 3 commits June 20, 2024 21:58

docs: add Alpine/apk to notes

0b40dff

test: add test for alpine:3 to install system package

9db24d2

note: feature does not currently implement building from source on Alpine

Merge branch 'main' into git-alpine

4a2d927

samruddhikhandale requested changes Jun 21, 2024

View reviewed changes

src/git/NOTES.md Show resolved Hide resolved

jonbackhaus added 7 commits June 21, 2024 19:33

Merge branch 'git-alpine' into git-alpine-install

2376a84

fix: working build from source!

9911ecf

still need to tweak the package dependencies and make config

perf: remove OBE gettext-dev package from dependencies

4c790c8

no longer required with "NO_GETTEXT=YesPlease" make config

perf: remove OBE libintl package from dependencies

ceeeaa9

no longer required with "NO_GETTEXT=YesPlease" make config (?)

feat: add remaining make options from apk package source reference

0376e17

docs: add refs. for alpine build from source

31f153b

test(git): add test case for building git from src on alpine:3

a255447

jonbackhaus requested a review from samruddhikhandale June 24, 2024 11:21

samruddhikhandale requested changes Jun 24, 2024

View reviewed changes

jonbackhaus added 2 commits June 24, 2024 22:51

fix: lint: SC2068: Double quote array expansions to avoid re-splittin…

8bf166c

…g elements

fix: use Devcontainer Alpine image as base (because it has bash ins…

e9b31c6

…talled); refactor test script names to remove major version suffix (since it isn't specified in the associated image tag)

samruddhikhandale requested changes Jun 25, 2024

View reviewed changes

jonbackhaus added 17 commits June 26, 2024 17:10

perf: consolidate to a single, jq-based implementation

fd36cd7

using `jq` avoids the need for PCRE `grep` expression (not supported in Alpine)

fix: set sysconfdir option for alpine build as well

941902d

see [devcontainers#395](devcontainers#395)

test: fix: alpine doesn't include perl support; leverage test cases f…

1a5a207

…rom `install_git_from_src.sh` script

style: remove unused options

30036fd

fix: set prefix option for alpine build to be consistent with other…

74736c3

… builds see [devcontainers#395](devcontainers#395)

refactor: move common arguments out of distro-specific logic

c9f8428

perf: minimum set of make options for building git from source in Alpine

882821e

chore: remove OBE code (unused make options for Git)

ea1279b

style: whitespace

78afedb

test: fix: remove gettext check (since this package isn't installed…

208d507

… in Alpine)

feat: update implementation based on local Git feature in `base-alpin…

7cc2d2a

…e` image

feat: remove libsecret-dev package

0feb1cb

not present in local Git feature in `base-alpine` image `install.sh` script

feat: switch glib-dev to g++ and gcc packages, based on local G…

0a76969

…it feature in `base-alpine` image

chore: remove alpine-sdk package, based on local Git feature in `ba…

4bed3d5

…se-alpine` image no longer needed, based on initial testing

revert: switch back to grep-based PCRE implementation, based on loc…

25216ca

…al Git feature in `base-alpine` image `jq` package no longer needed

test: revert: remove test cases (covered by generic `install_git_from…

a76f3aa

…_src.sh`)

test: fix: remove perl check for system package in Alpine (because th…

9ef5dde

…e system package is not built with PCRE support)

jonbackhaus changed the title ~~Add support for Alpine apk to Git feature~~ Add support for Alpine to git feature Jun 27, 2024

samruddhikhandale approved these changes Jun 27, 2024

View reviewed changes

samruddhikhandale merged commit 694906e into devcontainers:main Jun 27, 2024
12 checks passed

jonbackhaus deleted the git-alpine branch June 27, 2024 19:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for Alpine to `git` feature #1008

Add support for Alpine to `git` feature #1008

jonbackhaus commented Jun 19, 2024 •

edited

Loading

jonbackhaus commented Jun 19, 2024

samruddhikhandale left a comment

samruddhikhandale left a comment

samruddhikhandale left a comment

h3xcat commented Jun 28, 2024

Add support for Alpine to git feature #1008

Add support for Alpine to git feature #1008

Conversation

jonbackhaus commented Jun 19, 2024 • edited Loading

jonbackhaus commented Jun 19, 2024

samruddhikhandale left a comment

Choose a reason for hiding this comment

samruddhikhandale left a comment

Choose a reason for hiding this comment

samruddhikhandale left a comment

Choose a reason for hiding this comment

h3xcat commented Jun 28, 2024

Add support for Alpine to `git` feature #1008

Add support for Alpine to `git` feature #1008

jonbackhaus commented Jun 19, 2024 •

edited

Loading