diff --git a/docker-compose.yml b/docker-compose.yml index 63ff2e9..f679e8e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ version: '3.7' services: - pxe-container-s6: + pxe-container: build: . stdin_open: true tty: true @@ -13,7 +13,7 @@ services: - ${PWD}/media:/media/ - /boot:/boot container_name: pxe-container - image: pxe-image:s6-test01 + image: pxe-image pxe-samba: image: gists/samba-server @@ -27,6 +27,6 @@ services: - ${PWD}/samba:/etc/samba - ${PWD}/srv:/srv - ${PWD}/media:/media/ -# restart: unless-stoped + restart: unless-stopped depends_on: - - pxe-container-s6 + - pxe-container diff --git a/dockerfile b/dockerfile index 47e8be9..5296e70 100755 --- a/dockerfile +++ b/dockerfile @@ -13,18 +13,13 @@ RUN mkdir /app/RPi-PXE-Server COPY root/ / -#WORKDIR /app -#RUN git clone https://github.com/beta-tester/RPi-PXE-Server.git - -#VOLUME /app/RPi-PXE-Server -#COPY scripts/ /app/RPi-PXE-Server/ - VOLUME /app/RPi-PXE-Server VOLUME /srv VOLUME /etc/samba VOLUME /boot RUN rm -rf /temp/* + WORKDIR /app/RPi-PXE-Server ENTRYPOINT [ "/init" ] diff --git a/start.sh b/start.sh index 59bc29f..b526164 100644 --- a/start.sh +++ b/start.sh @@ -80,7 +80,7 @@ menue() D) clear docker-compose down - docker rmi pxe-image:s6-test01 + docker rmi pxe-image:latest echo "PXE-Server container and image deleted" echo "" clear