wzray/promty
1
0
Fork 0
Code Activity

хозяйственная работа: удалите ';' от Dockerfiles

Browse source
This commit is contained in:
Arthur K. 2026-01-31 14:59:35 +03:00
parent d087ebf369
commit da1b6c270a
Signed by: wzray
GPG key ID: B97F30FDC4636357
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
proxy/Dockerfile
View file

@ -3,7 +3,7 @@ FROM golang:1.23-alpine AS builder
WORKDIR /build WORKDIR /build
COPY . . 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 FROM alpine AS runner

10
puppy/Dockerfile
View file

@ -3,13 +3,13 @@
FROM debian:13-slim AS builder FROM debian:13-slim AS builder
RUN apt-get update && DEBIAN_FRONTEND=noninteracive apt-get install -y \ RUN apt-get update && DEBIAN_FRONTEND=noninteracive apt-get install -y \
--no-install-recommends cmake g++-mingw-w64-i686-posix g++ make && \ --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 WORKDIR /build
COPY app/healthcheck.cpp app/healthcheck.cpp COPY app/healthcheck.cpp app/healthcheck.cpp
COPY include/http include/http 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 app app
COPY include include COPY include include
@ -18,7 +18,7 @@ COPY CMakeLists.txt .
RUN --mount=type=cache,target=cmake-build cmake -B cmake-build \ RUN --mount=type=cache,target=cmake-build cmake -B cmake-build \
-DCMAKE_CXX_COMPILER=i686-w64-mingw32-g++ && cmake --build cmake-build -j$(nproc) && \ -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 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 \ apt-get install -y --no-install-recommends \
wine wine64 wine32:i386 && \ wine wine64 wine32:i386 && \
apt-get clean && rm -rf /var/lib/apt/lists/* && \ 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 COPY build/ $WINEPREFIX/drive_c
WORKDIR /app WORKDIR /app
COPY --from=builder /build/promt-puppy.exe /build/healthcheck . 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 EXPOSE 80/tcp
VOLUME /cache VOLUME /cache