Merge pull request #466 from MihailRis/update-dockerfile

Update Dockerfile & AppImage

.github/workflows/appimage.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-latest
+          - os: ubuntu-22.04
 
     runs-on: ${{ matrix.os }}
 
@@ -23,7 +23,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y build-essential libglfw3-dev libglfw3 libglew-dev \
+          sudo apt-get install -y build-essential libglfw3-dev libglfw3 libglew-dev libglew2.2 \
             libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev \
             libcurl4-openssl-dev libgtest-dev cmake squashfs-tools valgrind
           # fix luajit paths

Dockerfile

@@ -1,9 +1,9 @@
-# Build docker container: docker build -t voxel-engine .
+# Build docker container: docker build -t voxelcore .
-# Build project: docker run --rm -it -v$(pwd):/project voxel-engine bash -c "cmake -DCMAKE_BUILD_TYPE=Release -Bbuild && cmake --build build"
+# Build project: docker run --rm -it -v$(pwd):/project voxelcore bash -c "cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE -Bbuild && cmake --build build"
-# Run project in docker: docker run --rm -it -v$(pwd):/project -v/tmp/.X11-unix:/tmp/.X11-unix -v${XAUTHORITY}:/home/user/.Xauthority:ro -eDISPLAY --network=host voxel-engine ./build/VoxelEngine
+# Run project in docker: docker run --rm -it -v$(pwd):/project -v/tmp/.X11-unix:/tmp/.X11-unix -v${XAUTHORITY}:/home/user/.Xauthority:ro -eDISPLAY --network=host voxelcore ./build/VoxelEngine
 
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
-LABEL Description="Docker container for building VoxelEngine for Linux"
+LABEL Description="Docker container for building VoxelCore for Linux"
 
 # Install dependencies
 RUN apt-get update && apt-get install --no-install-recommends -y \
@@ -17,6 +17,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
     libglfw3-dev \
     libglfw3 \
     libglew-dev \
+    libglew2.2 \
     libglm-dev \
     libpng-dev \
     libopenal-dev \

dev/AppImageBuilder.yml

@@ -11,19 +11,19 @@ AppDir:
   apt:
     arch: amd64
     sources:
-    - sourceline: deb http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse
+    - sourceline: deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse
       key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3b4fe6acc0b21f32'
       key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x871920D1991BC93C'
-    - sourceline: deb http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse
+    - sourceline: deb http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse
-    - sourceline: deb http://archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse
+    - sourceline: deb http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse
-    - sourceline: deb http://archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse
+    - sourceline: deb http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse
     include:
     - libbz2-1.0
     - libexpat1
     - libfam0
     - libgcrypt20
     - libglfw3
-    - libglew2.1
+    - libglew2.2
     - libpng16-16
     - libopenal1
     - libasound2