zydronium/rdpgw
1
0
Fork 0
mirror of https://github.com/bolkedebruin/rdpgw.git synced 2025-08-26 10:13:28 +02:00
Code Issues Projects Releases Packages Wiki Activity

Make docker image use sratch

Browse source
This commit is contained in:
Bolke de Bruin 2022-08-26 09:46:59 +02:00
parent 96dcc62e11
commit 50f6d343f1
3 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmd/rdpgw/config/configuration.go
View file

@ -193,6 +193,12 @@ func Load(configFile string) Configuration {
if !Conf.Caps.TokenAuth && Conf.Server.Authentication == "openid" { if !Conf.Caps.TokenAuth && Conf.Server.Authentication == "openid" {
log.Fatalf("openid is configured but tokenauth disabled") log.Fatalf("openid is configured but tokenauth disabled")
} }
// prepend '//' if required for URL parsing
if !strings.Contains(Conf.Server.GatewayAddress, "//") {
Conf.Server.GatewayAddress = "//" + Conf.Server.GatewayAddress
}
return Conf return Conf
} }

2
cmd/rdpgw/main.go
View file

@ -88,7 +88,7 @@ func main() {
url.Scheme = "https" url.Scheme = "https"
} }
url.Path = "callback" url.Path = "callback"
api.GatewayAddress = url.Host api.GatewayAddress = url.String()
oauthConfig := oauth2.Config{ oauthConfig := oauth2.Config{
ClientID: conf.OpenId.ClientId, ClientID: conf.OpenId.ClientId,

27
dev/docker/Dockerfile
View file

@ -1,15 +1,7 @@
# builder stage # builder stage
FROM golang as builder FROM golang as builder
# define architectures which could be run rdpgw RUN apt-get update && apt-get install -y libpam-dev
RUN dpkgArch="$(dpkg --print-architecture)"; \
case "$dpkgArch" in \
arm) ARCH='arm' ;; \
arm64) ARCH='arm64' ;; \
amd64) ARCH='amd64' ;; \
386) ARCH='386' ;; \
*) echo >&2 "error: unsupported architecture: $apkArch"; exit 1 ;; \
esac
# certificate # certificate
RUN mkdir -p /opt/rdpgw && cd /opt/rdpgw && \ RUN mkdir -p /opt/rdpgw && cd /opt/rdpgw && \
@ -28,23 +20,22 @@ RUN adduser --disabled-password --gecos "" --home /opt/rdpgw --uid 1001 rdpgw
ARG CACHEBUST ARG CACHEBUST
RUN git clone https://github.com/bolkedebruin/rdpgw.git /app && \ RUN git clone https://github.com/bolkedebruin/rdpgw.git /app && \
cd /app && \ cd /app && \
go mod tidy -compat=1.17 && \ go mod tidy -compat=1.19 && \
CGO_ENABLED=0 GOOS=linux go build -trimpath -tags '' -ldflags '' -o '/opt/rdpgw/rdpgw' ./cmd/rdpgw && \ CGO_ENABLED=0 GOOS=linux go build -trimpath -tags '' -ldflags '' -o '/opt/rdpgw/rdpgw' ./cmd/rdpgw && \
CGO_ENABLED=1 GOOS=linux go build -trimpath -tags '' -ldflags '' -o '/opt/rdpgw/rdpgw-auth' ./cmd/auth && \
chmod +x /opt/rdpgw/rdpgw && \ chmod +x /opt/rdpgw/rdpgw && \
chmod +x /opt/rdpgw/rdpgw-auth && \
chmod u+s /opt/rdpgw/rdpgw-auth && \
chown -R 1001 /opt/rdpgw chown -R 1001 /opt/rdpgw
# FROM scratch FROM scratch
# FROM scratch is missing /bin/sh which is sadly needed to start the container.
FROM busybox
# Copy stuff from builder
COPY --from=builder /opt/rdpgw /opt/rdpgw COPY --from=builder /opt/rdpgw /opt/rdpgw
COPY --from=builder /etc/passwd /etc/passwd COPY --from=builder /etc/passwd /etc/passwd
# trust root CA
COPY --from=builder /etc/ssl/certs /etc/ssl/certs COPY --from=builder /etc/ssl/certs /etc/ssl/certs
# COPY --from=builder /bin/sh /bin/sh
# COPY rdpgw.yaml
COPY rdpgw.yaml /opt/rdpgw/rdpgw.yaml COPY rdpgw.yaml /opt/rdpgw/rdpgw.yaml
USER 1001 USER 1001
WORKDIR /opt/rdpgw WORKDIR /opt/rdpgw
ENTRYPOINT /opt/rdpgw/rdpgw ENTRYPOINT ["/opt/rdpgw/rdpgw"]