Socat verwijderd
Socat niet meet nodig ivm overgang naar zwavejs2mqtt
This commit is contained in:
parent
bd6b278ccc
commit
2c7afc6f55
19
Dockerfile
19
Dockerfile
@ -3,7 +3,6 @@ FROM debian:buster-slim
|
|||||||
ARG APP_VERSION
|
ARG APP_VERSION
|
||||||
ARG APP_HASH
|
ARG APP_HASH
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
|
|
||||||
ARG STABLE
|
ARG STABLE
|
||||||
|
|
||||||
LABEL org.label-schema.version=$APP_VERSION \
|
LABEL org.label-schema.version=$APP_VERSION \
|
||||||
@ -15,11 +14,11 @@ LABEL org.label-schema.version=$APP_VERSION \
|
|||||||
org.label-schema.name="Domoticz" \
|
org.label-schema.name="Domoticz" \
|
||||||
org.label-schema.description="Domoticz open source Home Automation system" \
|
org.label-schema.description="Domoticz open source Home Automation system" \
|
||||||
org.label-schema.license="GPLv3" \
|
org.label-schema.license="GPLv3" \
|
||||||
org.label-schema.docker.cmd="docker run -v ./config:/config -v ./plugins:/opt/domoticz/plugins -e DATABASE_PATH=/config/domoticz.db -p 8080:8080 -d /usr/local/bin/start.sh" \
|
# org.label-schema.docker.cmd="docker run -v ./config:/config -v ./plugins:/opt/domoticz/plugins -e DATABASE_PATH=/config/domoticz.db -p 8080:8080 -d /usr/local/bin/start.sh" \
|
||||||
|
|
||||||
maintainer="Domoticz Docker Maintainers <info@domoticz.com>"
|
maintainer="Domoticz Docker Maintainers <info@domoticz.com>"
|
||||||
|
|
||||||
# org.label-schema.docker.cmd="docker run -v ./config:/config -v ./plugins:/opt/domoticz/plugins -e DATABASE_PATH=/config/domoticz.db -p 8080:8080 -d domoticz/domoticz" \
|
org.label-schema.docker.cmd="docker run -v ./config:/config -v ./plugins:/opt/domoticz/plugins -e DATABASE_PATH=/config/domoticz.db -p 8080:8080 -d domoticz/domoticz" \
|
||||||
|
|
||||||
|
|
||||||
WORKDIR /opt/domoticz
|
WORKDIR /opt/domoticz
|
||||||
@ -72,15 +71,6 @@ RUN cpan Device::Modbus::TCP
|
|||||||
RUN apt-get install --reinstall ca-certificates -y
|
RUN apt-get install --reinstall ca-certificates -y
|
||||||
RUN git clone https://github.com/tjko/sunspec-monitor.git
|
RUN git clone https://github.com/tjko/sunspec-monitor.git
|
||||||
|
|
||||||
RUN apt-get install socat screen -y
|
|
||||||
#RUN git clone https://github.com/asaif/socat-init.git
|
|
||||||
#COPY socat.conf /etc/default/
|
|
||||||
#RUN cp socat-init/socat /etc/init.d/
|
|
||||||
#RUN chmod +x /etc/init.d/socat
|
|
||||||
#RUN update-rc.d socat defaults
|
|
||||||
|
|
||||||
#COPY /volume2/docker/build/domoticz-docker/socat.conf /etc/default/
|
|
||||||
|
|
||||||
VOLUME /opt/domoticz/userdata
|
VOLUME /opt/domoticz/userdata
|
||||||
|
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
@ -95,11 +85,6 @@ ENV EXTRA_CMD_ARG=
|
|||||||
# timezone env with default
|
# timezone env with default
|
||||||
ENV TZ=Europe/Amsterdam
|
ENV TZ=Europe/Amsterdam
|
||||||
|
|
||||||
#COPY start.sh /usr/local/bin/
|
|
||||||
#RUN chmod +x /usr/local/bin/start.sh \
|
|
||||||
# && ln -s usr/local/bin/start.sh / # backwards compat
|
|
||||||
#
|
|
||||||
|
|
||||||
COPY docker-entrypoint.sh /usr/local/bin/
|
COPY docker-entrypoint.sh /usr/local/bin/
|
||||||
RUN chmod +x /usr/local/bin/docker-entrypoint.sh \
|
RUN chmod +x /usr/local/bin/docker-entrypoint.sh \
|
||||||
&& ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
|
&& ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user