From 336cdfd3ee49dc834fb984b014443e9fe27798eb Mon Sep 17 00:00:00 2001 From: Alessandro Pilotti Date: Fri, 28 Aug 2020 18:44:27 +0200 Subject: [PATCH 1/2] Fix sample rdpgw.yaml Rename tokenSigningKey to PAATokenSigningKey --- dev/docker/rdpgw.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/docker/rdpgw.yaml b/dev/docker/rdpgw.yaml index 1897a4d..ccee2aa 100644 --- a/dev/docker/rdpgw.yaml +++ b/dev/docker/rdpgw.yaml @@ -5,7 +5,7 @@ server: port: 9443 hosts: - xrdp:3389 - roundRobin: false + roundRobin: false sessionKey: thisisasessionkeyreplacethisjetz sessionEncryptionKey: thisisasessionkeyreplacethisnunu openId: @@ -18,4 +18,4 @@ client: bandwidthAutoDetect: 1 ConnectionType: 6 security: - tokenSigningKey: prettypleasereplacemeinproductio + PAATokenSigningKey: prettypleasereplacemeinproductio From c971db956b5cb6bf17bb6d59239630ed1d596c8b Mon Sep 17 00:00:00 2001 From: Alessandro Pilotti Date: Fri, 28 Aug 2020 19:00:25 +0200 Subject: [PATCH 2/2] Use go 1.14.7 in Dockerfile --- dev/docker/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile index f26b14f..50c48fd 100644 --- a/dev/docker/Dockerfile +++ b/dev/docker/Dockerfile @@ -10,14 +10,19 @@ RUN apt-get update && \ -subj "/C=US/ST=VA/L=SomeCity/O=MyCompany/OU=MyDivision/CN=localhost" && \ openssl x509 -req -days 365 -in server.csr -signkey key.pem -out server.pem +RUN curl -L https://dl.google.com/go/go1.14.7.linux-amd64.tar.gz -o golang.tgz && \ + tar zxvf golang.tgz && rm golang.tgz + RUN git clone https://github.com/bolkedebruin/rdpgw.git && \ cd rdpgw && \ - env GOOS=linux GOARCH=amd64 go build && \ + env GOOS=linux GOARCH=amd64 GOROOT=/go /go/bin/go build && \ mkdir -p /opt/rdpgw && \ mv rdpgw /opt/rdpgw/rdpgw && \ rm -rf /root/go && \ rm -rf /rdpgw +RUN rm -rf /go + COPY rdpgw.yaml /opt/rdpgw/rdpgw.yaml RUN useradd -m -d /opt/rdpgw -u 1001 -c "rdgw" rdgw && \