From 5612067c4f778b8d69e3173af3be7b59630f5674 Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
Date: Tue, 2 May 2023 13:54:35 +0200
Subject: Fixed building of Docker image
---
.gitlab-ci.yml | 5 ++++-
Dockerfile | 7 +++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa6af61e..37115863 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,6 @@
+variables:
+ GIT_SUBMODULE_STRATEGY: recursive
+
dockerize:
image: docker
services:
@@ -16,4 +19,4 @@ test_dockerize:
script:
- docker build -t $CI_REGISTRY_IMAGE .
except:
- - master
\ No newline at end of file
+ - master
diff --git a/Dockerfile b/Dockerfile
index 989188de..9c722e4d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,14 @@
FROM fedora:36 as builder
RUN dnf install -y cmake gcc-c++ make libxml2-devel physfs-devel sqlite-devel \
- lua-devel libsigc++20-devel
+ lua-devel libsigc++20-devel rapidjson-devel
ADD . /source
-WORKDIR /source
+WORKDIR /source/libs/uWebSockets
+RUN make default
+
+WORKDIR /source
RUN cmake . -DCMAKE_INSTALL_PREFIX=/app
RUN make -j$(nproc) install
--
cgit v1.2.3-70-g09d2