Compare commits

..

No commits in common. "master" and "20200207" have entirely different histories.

3 changed files with 4 additions and 22 deletions

View file

@ -3,9 +3,6 @@ FROM golang:alpine
# Update # Update
RUN apk update upgrade; RUN apk update upgrade;
# Install git
RUN apk add git
# Set timezone to Europe/Zurich # Set timezone to Europe/Zurich
RUN apk add tzdata RUN apk add tzdata
RUN ln -s /usr/share/zoneinfo/Europe/Zurich /etc/localtime RUN ln -s /usr/share/zoneinfo/Europe/Zurich /etc/localtime
@ -24,9 +21,8 @@ RUN freshclam --quiet --no-dns
# Build go package # Build go package
ADD . /go/src/clamav-rest/ ADD . /go/src/clamav-rest/
RUN go get github.com/dutchcoders/go-clamd
ADD ./server.* /etc/ssl/clamav-rest/ ADD ./server.* /etc/ssl/clamav-rest/
RUN cd /go/src/clamav-rest && go mod init && go mod vendor && go build -v RUN cd /go/src/clamav-rest && go build -v
COPY entrypoint.sh /usr/bin/ COPY entrypoint.sh /usr/bin/
RUN mv /go/src/clamav-rest/clamav-rest /usr/bin/ && rm -Rf /go/src/clamav-rest RUN mv /go/src/clamav-rest/clamav-rest /usr/bin/ && rm -Rf /go/src/clamav-rest
@ -47,6 +43,6 @@ ENV MAX_PARTITIONS=50
ENV MAX_ICONSPE=100 ENV MAX_ICONSPE=100
ENV PCRE_MATCHLIMIT=100000 ENV PCRE_MATCHLIMIT=100000
ENV PCRE_RECMATCHLIMIT=2000 ENV PCRE_RECMATCHLIMIT=2000
ENV SIGNATURE_CHECKS=2 ENV SIGNATURE_CHECKS=24
ENTRYPOINT [ "entrypoint.sh" ] ENTRYPOINT [ "entrypoint.sh" ]

View file

@ -8,9 +8,8 @@
- [Configuration](#configuration) - [Configuration](#configuration)
- [Environment Variables](#environment-variables) - [Environment Variables](#environment-variables)
- [Networking](#networking) - [Networking](#networking)
- [Maintenance / Monitoring](#maintenance--monitoring) - [Maintenance](#maintenance)
- [Shell Access](#shell-access) - [Shell Access](#shell-access)
- [Developing](#developing) - [Developing](#developing)
- [References](#references) - [References](#references)
@ -135,7 +134,7 @@ Below is the complete list of available options that can be used to customize yo
|-----------|-------------| |-----------|-------------|
| `3310` | ClamD Listening Port | | `3310` | ClamD Listening Port |
# Maintenance / Monitoring # Maintenance
## Shell Access ## Shell Access
@ -144,15 +143,6 @@ For debugging and maintenance purposes you may want access the containers shell.
```bash ```bash
docker exec -it (whatever your container name is e.g. clamav-rest) /bin/sh docker exec -it (whatever your container name is e.g. clamav-rest) /bin/sh
``` ```
## Prometheus
[Prometheus metrics](https://prometheus.io/docs/guides/go-application/) were implemented, which can be retrieved as follows
**HTTP**:
curl http://localhost:9000/metrics
**HTTPS:**
curl https://localhost:9443/metrics
# Developing # Developing

View file

@ -12,7 +12,6 @@ import (
"time" "time"
"github.com/dutchcoders/go-clamd" "github.com/dutchcoders/go-clamd"
"github.com/prometheus/client_golang/prometheus/promhttp"
) )
var opts map[string]string var opts map[string]string
@ -185,9 +184,6 @@ func main() {
http.HandleFunc("/scanPath", scanPathHandler) http.HandleFunc("/scanPath", scanPathHandler)
http.HandleFunc("/", home) http.HandleFunc("/", home)
// Prometheus metrics
http.Handle("/metrics", promhttp.Handler())
// Start the HTTPS server in a goroutine // Start the HTTPS server in a goroutine
go http.ListenAndServeTLS(SSL_PORT, "/etc/ssl/clamav-rest/server.crt", "/etc/ssl/clamav-rest/server.key", nil) go http.ListenAndServeTLS(SSL_PORT, "/etc/ssl/clamav-rest/server.crt", "/etc/ssl/clamav-rest/server.key", nil)