diff --git a/proxy/Dockerfile b/proxy/Dockerfile index 5e46401..e80a6b5 100644 --- a/proxy/Dockerfile +++ b/proxy/Dockerfile @@ -3,7 +3,7 @@ FROM golang:1.23-alpine AS builder WORKDIR /build COPY . . -RUN --mount=type=cache,target=/go/pkg/mod go build; +RUN --mount=type=cache,target=/go/pkg/mod go build FROM alpine AS runner diff --git a/puppy/Dockerfile b/puppy/Dockerfile index b235ad9..0939ed3 100644 --- a/puppy/Dockerfile +++ b/puppy/Dockerfile @@ -3,13 +3,13 @@ FROM debian:13-slim AS builder RUN apt-get update && DEBIAN_FRONTEND=noninteracive apt-get install -y \ --no-install-recommends cmake g++-mingw-w64-i686-posix g++ make && \ - apt-get clean && rm -rf /var/lib/apt/lists/*; + apt-get clean && rm -rf /var/lib/apt/lists/* WORKDIR /build COPY app/healthcheck.cpp app/healthcheck.cpp COPY include/http include/http -RUN g++ -o healthcheck -I./include ./app/healthcheck.cpp; +RUN g++ -o healthcheck -I./include ./app/healthcheck.cpp COPY app app COPY include include @@ -18,7 +18,7 @@ COPY CMakeLists.txt . RUN --mount=type=cache,target=cmake-build cmake -B cmake-build \ -DCMAKE_CXX_COMPILER=i686-w64-mingw32-g++ && cmake --build cmake-build -j$(nproc) && \ - cp cmake-build/promt-puppy.exe .; + cp cmake-build/promt-puppy.exe . FROM debian:13-slim AS runner @@ -31,13 +31,13 @@ RUN dpkg --add-architecture i386 && apt-get update && \ apt-get install -y --no-install-recommends \ wine wine64 wine32:i386 && \ apt-get clean && rm -rf /var/lib/apt/lists/* && \ - mkdir -p /tmpfs $WINEPREFIX/drive_c && ln -sf /tmpfs $WINEPREFIX/drive_c/tmpfs; + mkdir -p /tmpfs $WINEPREFIX/drive_c && ln -sf /tmpfs $WINEPREFIX/drive_c/tmpfs COPY build/ $WINEPREFIX/drive_c WORKDIR /app COPY --from=builder /build/promt-puppy.exe /build/healthcheck . -HEALTHCHECK --start-period=30s --start-interval=1s CMD ./healthcheck; +HEALTHCHECK --start-period=30s --start-interval=1s CMD ./healthcheck EXPOSE 80/tcp VOLUME /cache