Skip to content
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

feat: upgrade docker environment to Ubuntu 22.04 #28

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# These owners will be the default owners for everything in
# the repo. Unless a later match takes precedence,
# They will be requested for review when someone opens a pull request.
* @kuang-da @dianehoffstetterupenn
* @CIS548/autograder-overlord
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

# Remove diverted man binary to prevent man-pages being replaced with "minimized" message.
# https://github.com/CIS380/docker-env/wiki/Install-man-page
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ docker buildx inspect --bootstrap
3. Build and push the images to `cis548/docker-env`. To push images to the Docker Hub reposiotry, make sure you have the right permissons to the repo.

```bash
docker buildx build . --platform=linux/amd64,linux/arm64/v8 -t cis548/docker-env --push
docker buildx build . --platform=linux/amd64,linux/arm64/v8 -t cis548/docker-env:latest --push
# change :latest to another tag if necessary
```

4. To learn more, the following sections in [this YouTube video](https://www.youtube.com/watch?v=hWSHtHasJUI) gives a step-by-step demo.
Expand Down
14 changes: 8 additions & 6 deletions docker-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ apt-get install -y gnupg
apt-get -y upgrade
apt-get install -y wget
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal main"
apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy main"

# install text editors and terminals
add-apt-repository ppa:jonathonf/vim
Expand All @@ -27,17 +27,19 @@ apt-get install -y tmux
apt-get install -y gdb valgrind

# install C stuff
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
apt-get install -y gcc clang clang-format make


# network stuff
apt-get install -y net-tools
apt-get install iputils-ping
apt-get install -y traceroute

# 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

Expand Down
2 changes: 1 addition & 1 deletion test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

echo -n "Checking dependencies... "

for name in gcc clang gdb valgrind git vim make tmux ifconfig unzip tar sudo man traceroute nslookup python3
for name in gcc clang gdb valgrind git vim make tmux ifconfig unzip tar sudo man traceroute nslookup python3 curl
do
[[ $(which $name 2>/dev/null) ]] || { echo -en "\n$name needs to be installed. Use 'sudo apt-get install $name'";deps=1; }
done
Expand Down