diff --git a/Dockerfile b/Dockerfile index dc5ee59..83521bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,14 +7,12 @@ RUN cd /src && go build . FROM alpine -RUN apk add arp-scan \ +RUN apk add --no-cache tzdata arp-scan \ && mkdir /data COPY src/templates /app/templates COPY --from=builder /src/watchyourlan /app/ -EXPOSE 8840 - WORKDIR /app ENTRYPOINT ["./watchyourlan"] \ No newline at end of file diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu deleted file mode 100644 index c6c5bf7..0000000 --- a/Dockerfile.ubuntu +++ /dev/null @@ -1,13 +0,0 @@ -FROM ubuntu:20.04 - -RUN apt update && apt install -y arp-scan && apt clean \ - && mkdir /data - -COPY src/templates /app/templates -COPY src/watchyourlan /app/ - -EXPOSE 8840 - -WORKDIR /app - -ENTRYPOINT ["./watchyourlan"] \ No newline at end of file diff --git a/Makefile b/Makefile index 5ff44bb..c757235 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,7 @@ docker-run: docker rm wyl || true docker run --name wyl \ -e "IFACE=virbr-bw" \ + -e "TZ=Asia/Novosibirsk" \ --network="host" \ -v ~/.dockerdata/wyl:/data \ $(DUSER)/$(DNAME):$(VERSION) @@ -32,4 +33,8 @@ clean: rm src/$(DNAME) || true docker rmi -f $(DUSER)/$(DNAME):latest $(DUSER)/$(DNAME):$(VERSION) -dev: go-build docker-build docker-run \ No newline at end of file +dev: docker-build docker-run + +docker-push: + docker push $(DUSER)/$(DNAME):latest + docker push $(DUSER)/$(DNAME):$(VERSION) \ No newline at end of file