diff --git a/Containerfile.custom b/Containerfile.custom index fd5f70def31a9afd8d09e985e151582a5db26c17..7e111719ac5e82bfbfbc3a3ac2fcc0bb7f987ac8 100644 --- a/Containerfile.custom +++ b/Containerfile.custom @@ -1,50 +1,15 @@ -# ____ _ _ _ -# | __ ) _ _(_) | __| | ___ _ __ -# | _ \| | | | | |/ _` |/ _ \ '__| -# | |_) | |_| | | | (_| | __/ | -# |____/ \__,_|_|_|\__,_|\___|_| -# -FROM docker.io/fedora as builder - -# This will be used in ubi-micro -RUN dnf --installroot=/tmp/ubi-micro \ - --nodocs --setopt=install_weak_deps=False \ - --releasever=40 \ - install -y \ - g++ shadow-utils && \ - dnf --installroot=/tmp/ubi-micro \ - clean all +FROM docker.io/fedora -# This is needed to build pict RUN dnf install -y cmake g++ && \ mkdir /tmp/pict -# Copy repo resources -COPY ./ /tmp/pict/ +COPY ./ /pict/ -# Build the pict -RUN cd /tmp/pict/ && \ +RUN cd /pict/ && \ rm -rf build && \ cmake -DCMAKE_BUILD_TYPE=Release -S . -B build && \ - cmake --build build && \ - cp build/cli/pict /tmp/ubi-micro/usr/local/bin/ - -# __ __ _ -# | \/ | __ _(_)_ __ -# | |\/| |/ _` | | '_ \ -# | | | | (_| | | | | | -# |_| |_|\__,_|_|_| |_| -# -FROM docker.io/fedora - -COPY --from=builder /tmp/ubi-micro/ / - -VOLUME /var/pict - -WORKDIR /var/pict - -RUN useradd -M pict + cmake --build build -USER pict +WORKDIR /pict/build/cli/ -ENTRYPOINT ["pict"] +ENTRYPOINT ["pict"] \ No newline at end of file