diff --git a/src/github.com/e-gov/fox/fox/Dockerfile b/src/github.com/e-gov/fox/fox/Dockerfile index 1147b3e..8e9d0cf 100644 --- a/src/github.com/e-gov/fox/fox/Dockerfile +++ b/src/github.com/e-gov/fox/fox/Dockerfile @@ -20,11 +20,8 @@ WORKDIR /src/github.com/e-gov/fox/fox/foxservice/ # fox,authn,authz use this config # temporary database data for foxservice -RUN mkdir /config/docker \ - && cp -n /config/config.json.template /config/docker/config.json \ - && mkdir -p /src/github.com/e-gov/fox/tmp/foxdb/ - -RUN go get -d && CGO_ENABLED=0 go build -a -installsuffix cgo -v \ +RUN mkdir -p /src/github.com/e-gov/fox/tmp/foxdb/ \ + && go get -d && CGO_ENABLED=0 go build -a -installsuffix cgo -v \ -o foxservice.o FoxService.go \ && cp foxservice.o /bin/foxservice diff --git a/src/github.com/e-gov/fox/login/Dockerfile b/src/github.com/e-gov/fox/login/Dockerfile index c7c243f..9d5fb7c 100644 --- a/src/github.com/e-gov/fox/login/Dockerfile +++ b/src/github.com/e-gov/fox/login/Dockerfile @@ -16,16 +16,14 @@ COPY ./src/github.com/e-gov/fox/util/ util/ ENV GOPATH=/ -# authn,authz use this config -# getConfigFolderPath() should find the config in /config/ -RUN mkdir /config/docker \ - && cp -n /config/config.json.template /config/docker/config.json \ - && go get -d vendor/github.com/e-gov/fox/authn/keygen/ \ - && go run /src/vendor/github.com/e-gov/fox/authn/keygen/KeyGen.go > /config/key.base64 - WORKDIR /src/github.com/e-gov/fox/login/loginservice/ -RUN go get -d && CGO_ENABLED=0 go build -a -installsuffix cgo -v \ +# authn,authz use this config +# getConfigFolderPath() should find the config in /config/ +RUN go get -d vendor/github.com/e-gov/fox/authn/keygen/ \ + && go run /src/vendor/github.com/e-gov/fox/authn/keygen/KeyGen.go \ + > /config/key.base64 \ + && go get -d && CGO_ENABLED=0 go build -a -installsuffix cgo -v \ -o loginservice.o LoginService.go \ && cp loginservice.o /bin/loginservice