Pārlūkot izejas kodu

Restructured project

Spencer Gardner 7 gadi atpakaļ
vecāks
revīzija
9d938bd916
3 mainītis faili ar 6 papildinājumiem un 5 dzēšanām
  1. 1 0
      .gitignore
  2. 5 5
      Dockerfile
  3. 0 0
      temperature_logger/log.go

+ 1 - 0
.gitignore

@@ -1 +1,2 @@
 /logger/debug
+/temperature_logger/debug

+ 5 - 5
Dockerfile

@@ -15,9 +15,9 @@ RUN apt-get update && apt-get upgrade -y
 #############################
 
 from golang as build-log
-RUN mkdir -p /go/src/log-temperature
-ADD log.go /go/src/log-temperature
-WORKDIR /go/src/log-temperature
+RUN mkdir -p /go/src/git.snppla.net/snppla/log_temperature
+ADD * /go/src/git.snppla.net/snppla/log_temperature/
+WORKDIR /go/src/git.snppla.net/snppla/log_temperature/temperature_logger
 ENV GOPATH /go
 ENV GOBIN /go/bin
 RUN go get
@@ -28,7 +28,7 @@ from debian as main
 RUN apt-get update && apt-get upgrade -y 
 RUN apt-get install -y librtlsdr0 && apt-get clean
 COPY --from=build-rtl_433 /rtl_433/install/bin/rtl_433 /usr/bin
-COPY --from=build-log /go/bin/log-temperature /usr/bin
+COPY --from=build-log /go/bin/temperature_logger /usr/bin
 
 ENV DB temperature
 ENV USER ""
@@ -37,7 +37,7 @@ ENV HOST http://localhost:8086
 ENV RTL_ARGS ""
 ENV LOCATIONS ""
 
-CMD rtl_433 $RTL_ARGS -F json | log-temperature -host $HOST -db $DB -password $PASSWORD -user $USER $LOCATIONS
+CMD rtl_433 $RTL_ARGS -F json | temperature_logger- -host $HOST -db $DB -password $PASSWORD -user $USER $LOCATIONS
 
 ##############################
 

+ 0 - 0
logger/log.go → temperature_logger/log.go