fix: update Dockerfile

Signed-off-by: Oleksii Orel <[email protected]>
che-incubator · May 14, 2024 · a26a670 · a26a670
1 parent 4d3a10f
commit a26a670
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/.devfile.Dockerfile b/.devfile.Dockerfile
@@ -48,26 +48,21 @@ RUN cd /tmp/pre-install \
     && unzip "/tmp/pre-install/openwrt-${OPENWRT_VERSION}.zip" -d /tmp/pre-install \
     && rm -rf /tmp/pre-install/openwrt-${OPENWRT_VERSION}.zip \
     && cd /tmp/pre-install/openwrt-${OPENWRT_VERSION} \
-    && cp /tmp/pre-install/openwrt/.config /tmp/pre-install/openwrt-${OPENWRT_VERSION}/.config \
     && cp -r /tmp/pre-install/openwrt/package /tmp/pre-install/openwrt-${OPENWRT_VERSION}/package \
     && cd /tmp/pre-install/openwrt-${OPENWRT_VERSION} \
     && scripts/feeds update -a -f \
     && scripts/feeds install -a -f \
     && cp /tmp/pre-install/openwrt/.config /tmp/pre-install/openwrt-${OPENWRT_VERSION}/.config \
     && make defconfig \
     && make -j$(nproc) \
-    && mv bin ../openwrt \
+    && zip -r helloworld.zip build_dir/target-x86_64_musl/helloworld-1.0.1/* || true \
+    && mv helloworld.zip ../openwrt || true \
+    && zip -r bin.zip bin/* \
     && rm -r bin \
-    && mv build_dir ../openwrt \
-    && rm -r build_dir \
-    && mv dl ../openwrt \
-    && rm -r dl \
-    && mv feeds ../openwrt \
+    && mv bin.zip ../openwrt \
+    && zip -r feeds.zip feeds/* \
     && rm -r feeds \
-    && mv staging_dir ../openwrt \
-    && rm -r staging_dir \
-    && mv tmp ../openwrt \
-    && rm -r tmp \
+    && mv feeds.zip ../openwrt \
     && cd /tmp/pre-install \
     && rm -rf /tmp/pre-install/openwrt-${OPENWRT_VERSION}
 

diff --git a/dockerfiles/qemu.Dockerfile b/dockerfiles/qemu.Dockerfile
@@ -2,7 +2,7 @@ FROM docker.io/library/alpine:3.19.1
 
 # Install QEMU, remove large unnecessary files
 RUN apk add --no-cache \
-        g++ \
+        mc \
         make \
         curl \
         make \
@@ -16,6 +16,7 @@ RUN apk add --no-cache \
         perl \
         openssh \
         sshpass \
+        gdb \
         && \
     rm -f /usr/share/qemu/edk2-*
 
@@ -220,14 +221,13 @@ 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::39000-:9000,hostfwd=tcp::30022-:22,hostfwd=tcp::30080-:80,hostfwd=tcp::30443-:443,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=""
 ENV QEMU_HOSTNAME="OpenWrtVM"
 ENV QEMU_ARGS=""
 
-EXPOSE 39000/tcp
 EXPOSE 5900/tcp
 EXPOSE 30022/tcp
 EXPOSE 30080/tcp