diff --git a/Dockerfile b/Dockerfile index 87d0dac..2e5fab7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,16 @@ -FROM quay.io/fedora/fedora-minimal +FROM alpine WORKDIR /usr/local/app -RUN dnf install -y unzip cmake clang ninja-build libxcb-devel libX11-devel libXcursor-devel libXi-devel libXrandr-devel libjpeg-turbo mesa-libGL-devel fontconfig-devel && dnf clean all -# Suboptimal libs: -# - 'GL/glx.h' file not found: mesa-libGL-devel +RUN apk --no-cache add cmake clang ninja-build libxcb-dev libx11-dev libxcursor-dev libxi-dev libxrandr-dev libjpeg-turbo libglx-dev +# Suboptimal libs? +# - 'GL/glx.h' file not found: mesa-dev # - 'fontconfig/fontconfig.h' file not found: fontconfig-dev -RUN curl -o aseprite.zip -L https://github.com/aseprite/aseprite/releases/download/v1.3.16/Aseprite-v1.3.16.1-Source.zip \ +RUN wget -O aseprite.zip https://github.com/aseprite/aseprite/releases/download/v1.3.16/Aseprite-v1.3.16.1-Source.zip \ && mkdir aseprite \ && unzip aseprite.zip -d aseprite \ && rm aseprite.zip -RUN curl -o Skia-Linux-Release-x64.zip -L https://github.com/aseprite/skia/releases/download/m124-08a5439a6b/Skia-Linux-Release-x64.zip \ +RUN wget -O Skia-Linux-Release-x64.zip https://github.com/aseprite/skia/releases/download/m124-08a5439a6b/Skia-Linux-Release-x64.zip \ && mkdir skia \ && unzip Skia-Linux-Release-x64.zip -d skia \ && rm Skia-Linux-Release-x64.zip diff --git a/src/build.sh b/src/build.sh index e7a97f4..b720f94 100755 --- a/src/build.sh +++ b/src/build.sh @@ -10,8 +10,10 @@ export CC=clang export CXX=clang++ export SKIA_HOME=/usr/local/app/skia export NINJA_PATH=/usr/lib/ninja-build/bin/ninja +export CMAKE_MAKE_PROGRAM=/usr/lib/ninja-build/bin/ninja export CMAKE_PREFIX_PATH=/usr/include; cmake \ + -DCMAKE_MAKE_PROGRAM=/usr/lib/ninja-build/bin/ninja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_CXX_FLAGS:STRING=-stdlib=libstdc++ \ -DCMAKE_EXE_LINKER_FLAGS:STRING=-stdlib=libstdc++ \ @@ -21,4 +23,4 @@ cmake \ -DSKIA_LIBRARY=$SKIA_HOME/out/Release-x64/libskia.a \ -G Ninja \ .. -ninja aseprite +$NINJA_PATH aseprite