Skip to content

Commit

Permalink
fixup! fix: update Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
olexii4 committed May 14, 2024
1 parent 41be66f commit 6dc7c6f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
13 changes: 8 additions & 5 deletions .devfile.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,19 @@ RUN cd /tmp/pre-install \
&& cp /tmp/pre-install/openwrt/.config /tmp/pre-install/openwrt-${OPENWRT_VERSION}/.config \
&& make defconfig \
&& make -j$(nproc) \
&& zip -r helloworld.zip build_dir/target-x86_64_musl/helloworld-1.0.1/* || true \
&& zip -r helloworld.zip build_dir/target-x86_64_musl || true \
&& rm -r staging_dir || true \
&& mv helloworld.zip ../openwrt || true \
&& zip -r toolchain.zip staging_dir/toolchain-x86_64_gcc-8.4.0_musl/* || true \
&& zip -r toolchain.zip staging_dir/toolchain-x86_64_gcc-8.4.0_musl || true \
&& rm -r staging_dir || true \
&& mv toolchain.zip ../openwrt || true \
&& zip -r dl.zip dl/* || true \
&& zip -r dl.zip dl || true \
&& rm -r dl || true \
&& mv dl.zip ../openwrt || true \
&& zip -r bin.zip bin/* \
&& zip -r bin.zip bin \
&& rm -r bin \
&& mv bin.zip ../openwrt \
&& zip -r feeds.zip feeds/* \
&& zip -r feeds.zip feeds \
&& rm -r feeds \
&& mv feeds.zip ../openwrt \
&& cd /tmp/pre-install \
Expand Down
3 changes: 1 addition & 2 deletions dockerfiles/qemu.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ ENV QEMU_STORAGE="1G"
ENV QEMU_SMP="2"
ENV QEMU_LAN_OPTIONS=""
ENV QEMU_WAN_NETWORK="172.16.0.0/24"
ENV QEMU_WAN_OPTIONS="hostfwd=tcp::30022-:22,hostfwd=tcp::30080-:80,hostfwd=tcp::30443-:443,hostfwd=tcp::39000-:9000,hostfwd=udp::51820-:51820"
ENV QEMU_WAN_OPTIONS="hostfwd=tcp::30022-:22,hostfwd=tcp::30080-:80,hostfwd=tcp::30443-:443,hostfwd=udp::51820-:51820"
ENV QEMU_PASSWORD="pass1234"
ENV QEMU_CONFIG_TIMEOUT="300"
ENV QEMU_CONFIG_NO_DEFAULTS=""
Expand All @@ -223,7 +223,6 @@ EXPOSE 5900/tcp
EXPOSE 30022/tcp
EXPOSE 30080/tcp
EXPOSE 30443/tcp
EXPOSE 39000/tcp
EXPOSE 51820/udp
HEALTHCHECK --interval=30s --timeout=30s --start-period=120s --retries=3 CMD [ "/usr/local/bin/healthcheck-vm.sh" ]
Expand Down

0 comments on commit 6dc7c6f

Please sign in to comment.