diff options
| author | Devaev Maxim <[email protected]> | 2018-08-09 04:53:12 +0300 |
|---|---|---|
| committer | Devaev Maxim <[email protected]> | 2018-08-09 04:53:12 +0300 |
| commit | 6f9f7455888b4132e5dca6762aee4c395f6b43fa (patch) | |
| tree | 0e7296159f25eaefb22f2ecf3a8b2a415dd0c512 /os | |
| parent | cf4f414b5fc8602a9bd271794468a8ff505e1e60 (diff) | |
fixed path to nginx.conf
Diffstat (limited to 'os')
| -rw-r--r-- | os/Makefile | 2 | ||||
| -rw-r--r-- | os/platforms/v1/Dockerfile.part | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/os/Makefile b/os/Makefile index 3956ef5e..5a9b48da 100644 --- a/os/Makefile +++ b/os/Makefile @@ -15,7 +15,7 @@ _pikvm: $(_BUILD_DIR) rm -rf $(_BUILD_DIR)/builder/scripts/pikvm cp -a platforms/$(PIKVM_PLATFORM) $(_BUILD_DIR)/stages/pikvm cd $(_BUILD_DIR) && make binfmt && make _rpi \ - BUILD_OPTS="--build-arg KVMD_VERSION=$(_KVMD_VERSION) --build-arg NEW_SSH_KEYGEN=$(shell uuidgen)" \ + BUILD_OPTS="--build-arg KVMD_VERSION=$(_KVMD_VERSION) --build-arg NEW_SSH_KEYGEN=$(shell uuidgen) --build-arg NEW_HTTPS_CERT=$(shell uuidgen)" \ PROJECT=pi-kvm \ PLATFORM=rpi-2 \ STAGES="__init__ os watchdog ro pikvm rootssh __cleanup__" \ diff --git a/os/platforms/v1/Dockerfile.part b/os/platforms/v1/Dockerfile.part index b66d52bf..b317eb84 100644 --- a/os/platforms/v1/Dockerfile.part +++ b/os/platforms/v1/Dockerfile.part @@ -19,9 +19,12 @@ RUN sed -i -e "s/console=ttyAMA0\,115200//g" /boot/cmdline.txt \ && sed -i -e "s/kgdboc=ttyAMA0\,115200//g" /boot/cmdline.txt RUN systemctl mask [email protected] -RUN cp /usr/share/kvmd/configs/nginx/nginx.conf.example /etc/nginx/ +RUN cp /usr/share/kvmd/configs/nginx/nginx.conf.example /etc/nginx/nginx.conf RUN cp /usr/share/kvmd/configs/kvmd/v1.yaml /etc/kvmd.yaml +ARG NEW_HTTPS_CERT +ENV NEW_HTTPS_CERT $NEW_HTTPS_CERT +RUN echo $NEW_HTTPS_CERT RUN mkdir /etc/nginx/ssl \ && cd /etc/nginx/ssl \ && openssl req -new -x509 -nodes -newkey rsa:4096 -keyout server.key -out server.crt -days 3650 \ |