From 8a61881fbc911cc6104abc200abbddf322c7812b Mon Sep 17 00:00:00 2001 From: gustaf71 Date: Wed, 26 Mar 2025 02:52:57 +0100 Subject: [PATCH] deleted: .DS_Store, this file is part of macOS modified: Dockerfile, update the file for wiringPi --- .DS_Store | Bin 6148 -> 0 bytes Dockerfile | 36 ++++++++++++++++++++---------------- 2 files changed, 20 insertions(+), 16 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 7a8c886abcc9d0ad1b82428cc043c8506611441b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}T>S5T32AO(;SS3hF7~Rj_I4k9Y}HU%-eSRBA$t24hy5v^j)A?&<^SgZMno z>~5vD^(ta_VCLJMo!Ky7!fpltSa;O70jdCCpb{2LG)simNf)G`JVit%_K5v7e)2=^ zFT`rc-(-N^T?s~zKmZ}kzQ1?>DGcJIR{LOuwPI<#Y?O_PapT_e)J?o(6nDMh70u2$ z5B=%b^Dlxy+N*9J^COiW{I@8IaH_Ygit{6$j9@S78|p>PVXIGCwv><*)lM|bF@3=>iq zfDbX+A&kk+e6?@CUiD6vwc0H#y3-Uz+f;P(@Nll^XIb5kMH4AYN}DTQZlbMbKr^uN z45;(dsH{8_ngGp!W?-HHIv*@lLPudPQ5+p;L<@jOzmY<4OuYoeaqN6aE Sh#nOEBOqwdMl diff --git a/Dockerfile b/Dockerfile index bfd8180..60b0371 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ -FROM debian:stable +FROM debian:stable-20241111 COPY . /workdir WORKDIR /workdir -RUN mkdir /docker_persistent +RUN mkdir /persistent -VOLUME /docker_persistent +VOLUME /persistent # get git, wget, dpkg-dev and gettext RUN apt update && apt install -y \ @@ -25,23 +25,27 @@ WORKDIR /api RUN ./build debian \ && apt install -y ./debian-template/wiringpi_3.14_arm64.deb +# change the directory +WORKDIR /workdir + +# setup docker RUN ./install.sh docker \ - && touch /docker_persistent/mbconfig.cfg \ - && touch /docker_persistent/persistent.file \ - && mkdir /docker_persistent/st_files \ - && cp /workdir/webserver/openplc.db /docker_persistent/openplc.db \ + && touch /persistent/mbconfig.cfg \ + && touch /persistent/persistent.file \ + && mkdir /persistent/st_files \ + && cp /workdir/webserver/openplc.db /persistent/openplc.db \ && mv /workdir/webserver/openplc.db /workdir/webserver/openplc_default.db \ - && cp /workdir/webserver/dnp3.cfg /docker_persistent/dnp3.cfg \ + && cp /workdir/webserver/dnp3.cfg /persistent/dnp3.cfg \ && mv /workdir/webserver/dnp3.cfg /workdir/webserver/dnp3_default.cfg \ - && cp -r /workdir/webserver/st_files/ /docker_persistent/st_files/ \ + && cp -r /workdir/webserver/st_files/ /persistent/st_files/ \ && mv /workdir/webserver/st_files /workdir/webserver/st_files_default \ - && cp /workdir/webserver/active_program /docker_persistent/active_program \ + && cp /workdir/webserver/active_program /persistent/active_program \ && mv /workdir/webserver/active_program /workdir/webserver/active_program_default \ - && ln -s /docker_persistent/mbconfig.cfg /workdir/webserver/mbconfig.cfg \ - && ln -s /docker_persistent/persistent.file /workdir/webserver/persistent.file \ - && ln -s /docker_persistent/openplc.db /workdir/webserver/openplc.db \ - && ln -s /docker_persistent/dnp3.cfg /workdir/webserver/dnp3.cfg \ - && ln -s /docker_persistent/st_files /workdir/webserver/st_files \ - && ln -s /docker_persistent/active_program /workdir/webserver/active_program + && ln -s /persistent/mbconfig.cfg /workdir/webserver/mbconfig.cfg \ + && ln -s /persistent/persistent.file /workdir/webserver/persistent.file \ + && ln -s /persistent/openplc.db /workdir/webserver/openplc.db \ + && ln -s /persistent/dnp3.cfg /workdir/webserver/dnp3.cfg \ + && ln -s /persistent/st_files /workdir/webserver/st_files \ + && ln -s /persistent/active_program /workdir/webserver/active_program ENTRYPOINT ["./start_openplc.sh"]