Fixed initial certs + Made dockerbuild faster when go-code changes

WowMuchName · Oct 28, 2018 · ff180fd · ff180fd
1 parent 2c4f89e
commit ff180fd
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang as gobuilder
+FROM golang:alpine as gobuilder
 ADD . /go
 RUN go build -o configurator
 
@@ -14,7 +14,6 @@ RUN mkdir -p /opt/certbot-slim \
  && rm -r /opt/certbot-slim/acme/examples \
  && rm -r /opt/certbot-slim/certbot/tests
 FROM python:2-alpine3.7
-COPY --from=gobuilder /go/configurator /go/template.https.conf /go/template.stream.conf /go/template.cert.sh /var/lib/configurator/
 COPY --from=certbot /opt/certbot-slim /opt/certbot/src/
 # Certbots filtered Dockerfile
 
@@ -179,6 +178,7 @@ STOPSIGNAL SIGTERM
 
 # End of Nginx's Dockerfile
 ADD nginx.conf global.conf /etc/nginx/
+COPY --from=gobuilder /go/configurator /go/template.https.conf /go/template.stream.conf /go/template.cert.sh /var/lib/configurator/
 RUN mkdir /webroot \
  && mkdir /backends \
  && mkdir /etc/nginx/stream-conf.d \

diff --git a/Dockerfile.middle b/Dockerfile.middle
@@ -1,2 +1 @@
-COPY --from=gobuilder /go/configurator /go/template.https.conf /go/template.stream.conf /go/template.cert.sh /var/lib/configurator/
 COPY --from=certbot /opt/certbot-slim /opt/certbot/src/
diff --git a/Dockerfile.prefix b/Dockerfile.prefix
@@ -1,4 +1,4 @@
-FROM golang as gobuilder
+FROM golang:alpine as gobuilder
 ADD . /go
 RUN go build -o configurator
 

diff --git a/Dockerfile.suffix b/Dockerfile.suffix
@@ -1,4 +1,5 @@
 ADD nginx.conf global.conf /etc/nginx/
+COPY --from=gobuilder /go/configurator /go/template.https.conf /go/template.stream.conf /go/template.cert.sh /var/lib/configurator/
 RUN mkdir /webroot \
  && mkdir /backends \
  && mkdir /etc/nginx/stream-conf.d \

diff --git a/configurator.go b/configurator.go
@@ -66,7 +66,7 @@ func waitForHttpPort() error {
 		if tries--; tries == 0 {
 			return errors.New("Timeout waiting for http socket")
 		}
-		//time.Sleep(250 * time.Millisecond)
+		time.Sleep(250 * time.Millisecond)
 	}
 }
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		COPY --from=gobuilder /go/configurator /go/template.https.conf /go/template.stream.conf /go/template.cert.sh /var/lib/configurator/
		COPY --from=certbot /opt/certbot-slim /opt/certbot/src/