From d4aabab9dfdda7267d711268e79969d204a4c909 Mon Sep 17 00:00:00 2001 From: Daniel Pawlik Date: Mon, 26 Jun 2023 08:21:11 +0200 Subject: [PATCH] Update README and Dockerfile --- Dockerfile | 14 +++++++------- README.md | 5 +++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7d8508f..4d8257c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,24 +1,24 @@ FROM fedora:38 -RUN yum update -y +RUN yum update -y && dnf -y groupinstall 'Development Tools' -RUN dnf -y groupinstall 'Development Tools' - -RUN dnf -y install bash-completion bzip2 gcc gcc-c++ git make ncurses-devel patch \ +RUN dnf -y install vim bash-completion bzip2 gcc gcc-c++ git make ncurses-devel patch \ rsync tar unzip wget which diffutils python2 python3 perl-base \ perl-Data-Dumper perl-File-Compare perl-File-Copy perl-FindBin \ - perl-Thread-Queue vim hostname perl-IPC-Cmd swig ccache-swig && \ + perl-Thread-Queue hostname perl-IPC-Cmd swig ccache-swig && \ dnf install -y clang llvm gcc libbpf-devel libxdp-devel xdp-tools \ bpftool kernel-headers elfutils-libelf-devel zlib-devel libpcap-devel \ m4 wireshark-cli && \ dnf clean all RUN useradd -m user && \ - echo 'user ALL=NOPASSWD: ALL' > /etc/sudoers.d/user + echo 'user ALL=NOPASSWD: ALL' > /etc/sudoers.d/user ; \ + echo 'export PS1="[\u@\h \W]\$"' >> .bashrc USER user WORKDIR /home/user # set dummy git config RUN /usr/bin/git config --global user.email "you@example.com" ; \ - /usr/bin/git config --global user.name "Your Name" + /usr/bin/git config --global user.name "Your Name" ; \ + echo 'export PS1="[\u@\h \W]\$"' >> .bashrc diff --git a/README.md b/README.md index b75c26f..e2b7e9b 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,8 @@ how to use: ```shell mkdir -p openwrt-builder -podman run -it -u user -v $(pwd)/openwrt-builder/:/home/user:z,rw quay.io/dpawlik/openwrt:f37 /bin/bash +chmod 0777 openwrt-builder +podman run -it -u user -v $(pwd)/openwrt-builder/:/home/user:z,rw quay.io/dpawlik/openwrt:f38 /bin/bash ``` Then inside the container (from https://openwrt.org/docs/guide-developer/toolchain/use-buildsystem): @@ -35,7 +36,7 @@ Select a specific code revision: ```shell git branch -a git tag -git checkout v21.02.1 +git checkout v23.05.0-rc1 ``` Update the feeds: