From 5519fd780ed97a402ecdb243e5ff452e4b246279 Mon Sep 17 00:00:00 2001 From: Will Bollock Date: Mon, 4 Dec 2023 13:28:15 -0500 Subject: [PATCH] fix: get rid of docker dir led to annoying build errors --- .goreleaser.yaml | 2 -- docker/Dockerfile => Dockerfile | 2 +- docker/docker-compose.yaml => docker-compose.yaml | 0 docker/prometheus.yml => prometheus.yml | 0 4 files changed, 1 insertion(+), 3 deletions(-) rename docker/Dockerfile => Dockerfile (90%) rename docker/docker-compose.yaml => docker-compose.yaml (100%) rename docker/prometheus.yml => prometheus.yml (100%) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index f5e7d46..ddaf913 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -56,7 +56,6 @@ dockers: - "--label=org.opencontainers.image.description='Yet another prometheus ping exporter'" - "--label=org.opencontainers.image.licenses=MIT" - "--platform=linux/amd64" - dockerfile: "docker/Dockerfile" - image_templates: - "ghcr.io/wbollock/{{.ProjectName}}:{{ .Tag }}-linux-arm64" use: buildx @@ -72,7 +71,6 @@ dockers: - "--label=org.opencontainers.image.description='Yet another prometheus ping exporter'" - "--label=org.opencontainers.image.licenses=MIT" - "--platform=linux/arm64" - dockerfile: "docker/Dockerfile" nfpms: - id: default formats: diff --git a/docker/Dockerfile b/Dockerfile similarity index 90% rename from docker/Dockerfile rename to Dockerfile index e26b0aa..4ef40fb 100644 --- a/docker/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM golang:alpine3.18 AS builderimage LABEL maintainer="Will Bollock " WORKDIR /go/src/ping-exporter COPY . . -RUN go build -o ping-exporter ../cmd/main.go +RUN go build -o ping-exporter cmd/main.go ################################################################### diff --git a/docker/docker-compose.yaml b/docker-compose.yaml similarity index 100% rename from docker/docker-compose.yaml rename to docker-compose.yaml diff --git a/docker/prometheus.yml b/prometheus.yml similarity index 100% rename from docker/prometheus.yml rename to prometheus.yml