From 363c8405e38923ffa14a4305690af51864128135 Mon Sep 17 00:00:00 2001 From: strNophix Date: Sun, 28 Aug 2022 12:27:01 +0200 Subject: [PATCH 1/2] Changed name of dev docker-compose --- docker-compose.yml => docker-compose.dev.yml | 7 ------- 1 file changed, 7 deletions(-) rename docker-compose.yml => docker-compose.dev.yml (80%) diff --git a/docker-compose.yml b/docker-compose.dev.yml similarity index 80% rename from docker-compose.yml rename to docker-compose.dev.yml index f33eab2..319d9ac 100644 --- a/docker-compose.yml +++ b/docker-compose.dev.yml @@ -17,13 +17,6 @@ services: - .docker/prometheus:/etc/prometheus - prometheus-data:/prometheus command: --web.enable-lifecycle --config.file=/etc/prometheus/prometheus.yml - # api: - # build: - # context: . - # ports: - # - 5111:5111 - # depends_on: - # - scylla volumes: prometheus-data: From a74ba3baf36ccf2c77f5c486f817f3037a705595 Mon Sep 17 00:00:00 2001 From: strNophix Date: Sun, 28 Aug 2022 12:45:00 +0200 Subject: [PATCH 2/2] Changed TZ and base image of Dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index d4522e1..7de6fc1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:alpine AS builder +FROM golang:1.19-alpine AS builder LABEL stage=gobuilder @@ -19,8 +19,8 @@ RUN go build -ldflags="-s -w" -o /app/5feet11 . FROM scratch COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=builder /usr/share/zoneinfo/Europe/Amsterdam /usr/share/zoneinfo/Europe/Amsterdam -ENV TZ Europe/Amsterdam +COPY --from=builder /usr/share/zoneinfo/Etc/UTC /usr/share/zoneinfo/Etc/UTC +ENV TZ Etc/UTC WORKDIR /app COPY --from=builder /app/5feet11 /app/5feet11