From bf436099efd4fc326fc3a268c1b9059d3cd613ff Mon Sep 17 00:00:00 2001 From: Antonio Esparza Date: Fri, 31 May 2024 13:29:10 -0400 Subject: [PATCH 1/3] fix: use group for PR review --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index 5bbc6f2..29ba11c 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -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 \ No newline at end of file +* @CIS548/autograder-overlord \ No newline at end of file From d45cd98931eaaa77fb08d32dde1f321a22110e39 Mon Sep 17 00:00:00 2001 From: Antonio Esparza Date: Fri, 31 May 2024 13:29:40 -0400 Subject: [PATCH 2/3] fix: indicate how to make different tags in dockerhub --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fef970e..418d9ec 100644 --- a/README.md +++ b/README.md @@ -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. From 98896b2951e7ab6f7c9b86beb8049c05d0cedb9f Mon Sep 17 00:00:00 2001 From: Antonio Esparza Date: Fri, 31 May 2024 15:19:34 -0400 Subject: [PATCH 3/3] feat: use ubuntu 22.04 --- Dockerfile | 2 +- docker-setup.sh | 14 ++++++++------ test.sh | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index fb6764a..dc5675e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/docker-setup.sh b/docker-setup.sh index 6f5461a..2e59d0f 100644 --- a/docker-setup.sh +++ b/docker-setup.sh @@ -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 @@ -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 diff --git a/test.sh b/test.sh index 0b3bc8b..dfce67c 100755 --- a/test.sh +++ b/test.sh @@ -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