incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bump to ubuntu 24.04 and remove cmake downgrade version

Browse Source
This commit is contained in:
duhow
2024-08-24 14:13:40 +02:00
committed by Martin Michelsen
parent 4a40dfd361
commit de2df5f6cf
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+1 -3
View File
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG BASE_IMAGE=ubuntu:22.04 ARG BASE_IMAGE=ubuntu:24.04
FROM ${BASE_IMAGE} AS builder FROM ${BASE_IMAGE} AS builder
RUN apt update && apt install -y --no-install-recommends \ RUN apt update && apt install -y --no-install-recommends \
@@ -24,7 +24,6 @@ ARG BUILD_RESOURCE_DASM=true
RUN git clone --depth 1 -b ${PHOSG_TARGET} https://github.com/fuzziqersoftware/phosg.git && \ RUN git clone --depth 1 -b ${PHOSG_TARGET} https://github.com/fuzziqersoftware/phosg.git && \
cd phosg && \ cd phosg && \
sed -i 's/VERSION 3\.[0-9]\+/VERSION 3.10/' CMakeLists.txt && \
cmake . && \ cmake . && \
make -j$(nproc) && \ make -j$(nproc) && \
sudo make install sudo make install
@@ -33,7 +32,6 @@ RUN \
if [ "$BUILD_RESOURCE_DASM" = "true" ] ; then \ if [ "$BUILD_RESOURCE_DASM" = "true" ] ; then \
git clone --depth 1 -b ${RESOURCE_DASM_TARGET} https://github.com/fuzziqersoftware/resource_dasm.git && \ git clone --depth 1 -b ${RESOURCE_DASM_TARGET} https://github.com/fuzziqersoftware/resource_dasm.git && \
cd resource_dasm && \ cd resource_dasm && \
sed -i 's/VERSION 3\.[0-9]\+/VERSION 3.10/' CMakeLists.txt && \
cmake . && \ cmake . && \
make -j$(nproc) && \ make -j$(nproc) && \
sudo make install \ sudo make install \