diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml index ffe53c3..f79f9c6 100644 --- a/.github/workflows/builder.yml +++ b/.github/workflows/builder.yml @@ -34,7 +34,7 @@ jobs: sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /usr/local/lib/android /opt/ghc /opt/hostedtoolcache/CodeQL sudo docker image prune --all --force sudo -E apt-get -qq update - sudo -E ./dependencies.sh + sudo -E ./devenv/dependencies.sh sudo -E apt-get -qq autoremove --purge sudo -E apt-get -qq clean sudo timedatectl set-timezone "$TZ" diff --git a/Dockerfile b/devenv/Dockerfile similarity index 94% rename from Dockerfile rename to devenv/Dockerfile index 28de48d..0e8bc4f 100644 --- a/Dockerfile +++ b/devenv/Dockerfile @@ -21,7 +21,7 @@ ENV BRANCH main RUN git clone --depth=1 -b ${BRANCH} https://git.openwrt.org/openwrt/openwrt.git openwrt -COPY enable_wcn36xx_mac80211.patch . +COPY ../enable_wcn36xx_mac80211.patch . RUN git apply enable_wcn36xx_mac80211.patch RUN openwrt/scripts/feeds update -a && \ diff --git a/dependencies.sh b/devenv/dependencies.sh similarity index 100% rename from dependencies.sh rename to devenv/dependencies.sh diff --git a/docker-compose.yml b/devenv/docker-compose.yml similarity index 72% rename from docker-compose.yml rename to devenv/docker-compose.yml index 8b19c2b..d082283 100644 --- a/docker-compose.yml +++ b/devenv/docker-compose.yml @@ -4,7 +4,7 @@ services: command: > sh -c "chown -R 1000:1000 /home/builder/openwrt/dl /home/builder/openwrt/bin /home/builder/openwrt/build_dir" volumes: - - ./bin:/home/builder/openwrt/bin + - ../bin:/home/builder/openwrt/bin - dl:/home/builder/openwrt/dl - build_dir:/home/builder/openwrt/build_dir user: root @@ -17,12 +17,11 @@ services: stdin_open: true tty: true volumes: - - .:/repo - - ./packages:/home/builder/openwrt/package/uz801 - - ./msm89xx:/home/builder/openwrt/target/linux/msm89xx - - ./bin:/home/builder/openwrt/bin + - ..:/repo + - ../packages:/home/builder/openwrt/package/uz801 + - ../msm89xx:/home/builder/openwrt/target/linux/msm89xx + - ../bin:/home/builder/openwrt/bin # - ./files:/home/builder/openwrt/files - # - ./diffconfig:/home/builder/openwrt/.config - dl:/home/builder/openwrt/dl - build_dir:/home/builder/openwrt/build_dir command: ["/bin/bash"] diff --git a/readme.md b/readme.md index 9f46f32..8022921 100644 --- a/readme.md +++ b/readme.md @@ -22,6 +22,7 @@ Modern version of OpenWrt working on UZ801v3: ### How to build OpenWrt Docker is required! ```bash +cd devenv docker compose run --rm builder # This will open bash inside a build environment cp /repo/diffconfig .config # Copies the config on to the working folder make defconfig