Fix Docker files

This commit is contained in:
Brendan Abolivier 2019-05-22 09:58:20 +01:00
parent 74827428bd
commit 2d52771fcc
3 changed files with 4 additions and 6 deletions

View file

@ -1,10 +1,9 @@
FROM golang:alpine3.6
FROM docker.io/golang:1.12.5-alpine3.9
RUN mkdir /build
WORKDIR /build
RUN apk --update --no-cache add openssl bash git && \
go get github.com/constabulary/gb/...
RUN apk --update --no-cache add openssl bash git
CMD ["bash", "docker/build.sh"]

View file

@ -1,6 +1,6 @@
#!/bin/bash
gb build
./build.sh
# Generate the keys if they don't already exist.
if [ ! -f server.key ] || [ ! -f server.crt ] || [ ! -f matrix_key.pem ]; then
@ -12,7 +12,7 @@ if [ ! -f server.key ] || [ ! -f server.crt ] || [ ! -f matrix_key.pem ]; then
-keyout server.key \
-out server.crt \
-days 3650 -nodes \
-subj /CN=localhost
-subj /CN=localhost
test -f matrix_key.pem || /build/bin/generate-keys -private-key matrix_key.pem
fi

View file

@ -7,7 +7,6 @@ services:
build: ./
volumes:
- ..:/build
- ./build/pkg:/build/pkg
- ./build/bin:/build/bin
networks:
- internal