diff options
| author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2023-05-02 13:54:35 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2023-05-05 16:03:23 +0000 |
| commit | 5612067c4f778b8d69e3173af3be7b59630f5674 (patch) | |
| tree | 33497b357b7cd2ffdaacaf4b5223bcf653af902e | |
| parent | ee4624e7904f37c411fc7215d7c41d7a1b6b7d4f (diff) | |
| download | manaserv-5612067c4f778b8d69e3173af3be7b59630f5674.tar.gz manaserv-5612067c4f778b8d69e3173af3be7b59630f5674.tar.bz2 manaserv-5612067c4f778b8d69e3173af3be7b59630f5674.tar.xz manaserv-5612067c4f778b8d69e3173af3be7b59630f5674.zip | |
Fixed building of Docker image
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | 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 @@ -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 |