Merge branch 'master' of github.com:anticitizn/solnce

anticitizn · Mar 14, 2023 · a906d0e · a906d0e
2 parents 30adcae + 440288f
commit a906d0e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -5,6 +5,6 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt update \
     && apt upgrade -y \
     && apt install -y --no-install-recommends \
-    apt-utils build-essential clang cmake libsdl2-dev libc6 libc-bin
+    apt-utils zip build-essential clang cmake libsdl2-dev libc6 libc-bin
 
-WORKDIR /usr/src/solnce/
+WORKDIR /usr/src/solnce/
diff --git a/build.sh b/build.sh
@@ -5,4 +5,5 @@ fi
 
 cd build
 cmake ../
-make -j $(nproc)
+make -j $(nproc)
+cd ..
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,4 +4,4 @@ services:
     container_name: solnce_build
     volumes:
       - .:/usr/src/solnce/
-    command: bash ./build.sh; zip -r solnce.zip assets/ src/shaders/ solnce
+    command: bash -c "./build.sh && zip -r solnce.zip assets/ src/shaders/ solnce"