From f75321f6b7cb397609a6019f0836cb5b104a3a3b Mon Sep 17 00:00:00 2001 From: Bolke de Bruin <bolke@xs4all.nl> Date: Mon, 18 Mar 2024 13:26:24 +0100 Subject: [PATCH] Base on alpine and run both rdpgw-auth and gateway --- dev/docker/Dockerfile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile index 3a03068..6d91e06 100644 --- a/dev/docker/Dockerfile +++ b/dev/docker/Dockerfile @@ -1,7 +1,8 @@ # builder stage -FROM golang as builder +FROM golang:1.22-alpine as builder -RUN apt-get update && apt-get install -y libpam-dev +#RUN apt-get update && apt-get install -y libpam-dev +RUN apk --no-cache add git gcc musl-dev linux-pam-dev openssl # add user RUN adduser --disabled-password --gecos "" --home /opt/rdpgw --uid 1001 rdpgw @@ -27,18 +28,20 @@ RUN git clone https://github.com/bolkedebruin/rdpgw.git /app && \ chmod +x /opt/rdpgw/rdpgw-auth && \ chmod u+s /opt/rdpgw/rdpgw-auth -FROM scratch +FROM alpine:latest + +RUN apk --no-cache add linux-pam musl # make tempdir in case filestore is used ADD tmp.tar / USER 1001 +COPY --chown=1001 run.sh run.sh COPY --chown=1001 --from=builder /opt/rdpgw /opt/rdpgw COPY --chown=1001 --from=builder /etc/passwd /etc/passwd COPY --chown=1001 --from=builder /etc/ssl/certs /etc/ssl/certs - COPY --chown=1001 rdpgw.yaml /opt/rdpgw/rdpgw.yaml WORKDIR /opt/rdpgw -ENTRYPOINT ["/opt/rdpgw/rdpgw"] +ENTRYPOINT ["/bin/sh", "/run.sh"] -- GitLab