From 7f56569d420cf12cc35d7195af9066e3954a1390 Mon Sep 17 00:00:00 2001
From: Krzysztof Adamski <krzysztof_adamski@o2.pl>
Date: Wed, 22 Dec 2021 08:16:40 +0100
Subject: [PATCH] fix docker build
---
dev/docker/Dockerfile | 7 ++++---
dev/docker/docker-compose.yml | 12 ++++++++++++
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile
index 50c48fd..a58c8d4 100644
--- a/dev/docker/Dockerfile
+++ b/dev/docker/Dockerfile
@@ -10,14 +10,15 @@ 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 && \
+RUN curl -L https://dl.google.com/go/go1.17.5.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 GOROOT=/go /go/bin/go build && \
+ env GOOS=linux GOARCH=amd64 GOROOT=/go /go/bin/go mod tidy && \
+ env GOOS=linux GOARCH=amd64 GOROOT=/go /go/bin/go build -trimpath -tags '' -ldflags '' -o '/rdpgw/bin/rdpgw' ./cmd/rdpgw && \
mkdir -p /opt/rdpgw && \
- mv rdpgw /opt/rdpgw/rdpgw && \
+ mv /rdpgw/bin/rdpgw /opt/rdpgw/rdpgw && \
rm -rf /root/go && \
rm -rf /rdpgw
diff --git a/dev/docker/docker-compose.yml b/dev/docker/docker-compose.yml
index a5e086f..362b89d 100644
--- a/dev/docker/docker-compose.yml
+++ b/dev/docker/docker-compose.yml
@@ -34,3 +34,15 @@ services:
- ${PWD}/xrdp_users.txt:/root/createusers.txt
environment:
TZ: "Europe/Amsterdam"
+ rdpgw:
+ build: .
+ ports:
+ - 9443:9443
+ restart: on-failure
+ depends_on:
+ - keycloak
+ healthcheck:
+ test: ["CMD", "curl", "-f", "http://keycloak:8080"]
+ interval: 30s
+ timeout: 10s
+ retries: 10
--
GitLab