Skip to content

feat: default to main branch #32

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.

Sign up for GitHub

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
alesparza merged 3 commits into from
May 5, 2025
Merged

feat: default to main branch #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e8a768
feat: build git 2.49.0 from source
alesparza May 3, 2025
8509479
chore: ensure new line
alesparza May 3, 2025
b4b30a3
fix: keep the old repository until instructions updated
alesparza May 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions build-images.sh
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,4 @@ docker buildx use mybuilder
docker buildx inspect --bootstrap

# main build command: build and push images to DockerHub
docker buildx build . --platform=linux/amd64,linux/arm64/v8 -t cis548/595-docker-env:$1 --push

# build arm64 only for quick development. Uncomment the following line and comment out the main build command
# docker buildx build . --platform=linux/arm64/v8 -t cis548/595-project3-docker-env:$1 --push

docker buildx build . --platform=linux/amd64,linux/arm64/v8 -t cis548/docker-env:$1 --push
17 changes: 16 additions & 1 deletion docker-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,18 @@ apt-get install -y gcc clang-10 clang-format-10 make
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-10 100
update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-10 100



# install miscellaneous things I can't categorise
apt-get install -y lldb-3.8
apt-get install -y git-all
apt-get install -y curl
apt-get install -y sudo
apt-get install -y net-tools
apt-get install -y traceroute
apt-get install -y dnsutils
apt-get install -y zip
# needed for git-from-source
apt-get install -y autoconf libz-dev gettext asciidoc

# prevent errors about no dialog installed when attempting to use apt inside container
apt-get install -y dialog
Expand All @@ -48,3 +51,15 @@ apt-get install -y dialog
apt-get install -y man man-db manpages-posix manpages-dev manpages-posix-dev
apt-get install -y neofetch

# install git from source
curl https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.49.0.tar.gz > git-2.49.0.tar.gz
tar -xvf git-2.49.0.tar.gz
cd git-2.49.0
make configure
./configure --prefix=/usr
make all
sudo make install
cd ..
rm -f -r git-2.49.0
# all of this is to make the default branch "main"
git config --global init.defaultBranch main