diff --git a/.env.dev b/.env.dev deleted file mode 100644 index 9ec3b58..0000000 --- a/.env.dev +++ /dev/null @@ -1,7 +0,0 @@ -BSKYFEEDCTL_FIREHOSE_HOST="relay1.eurosky.network" -BSKYFEEDCTL_FEED_OWNERDID="at://did:plc:ryyjyoqbea5zmanqtutkbc4o" -BSKYFEEDCTL_FEED_FEEDDID="did:web:blueskyfeeds.dhawos.dev" -BSKYFEEDCTL_ELASTICSEARCH_HOST="localhost" -BSKYFEEDCTL_ELASTICSEARCH_PORT="9200" -BSKYFEEDCTL_ELASTICSEARCH_USERNAME="elastic" -BSKYFEEDCTL_ELASTICSEARCH_PASSWORD="password" diff --git a/.envrc b/.envrc index 7ddec38..76caf0d 100644 --- a/.envrc +++ b/.envrc @@ -1,3 +1,2 @@ -dotenv .env.dev dotenv .env.dev.secrets use flake diff --git a/.gitignore b/.gitignore index a60bd30..8df7004 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ dist *.tfvars *.tfstate .terraform/ +result diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index b94479a..0000000 --- a/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -FROM golang:1.26.4 AS builder - -RUN apt-get update && \ - apt-get install git -y - -COPY go.mod go.sum . -RUN go mod download -COPY . . -RUN go build -o /go/dist/bskyfeedctl main.go - -FROM ubuntu:26.04 AS runner -RUN useradd app && mkdir /app -RUN apt-get update && apt-get install -y ca-certificates && update-ca-certificates -COPY --from=builder /go/dist/bskyfeedctl /app/bskyfeedctl - -RUN chown -R app /app && chmod +x /app/bskyfeedctl - -WORKDIR /app -USER app - -RUN touch config.yaml && /app/bskyfeedctl --help - -ENTRYPOINT ["/app/bskyfeedctl"] - diff --git a/config.dev.yaml b/config.dev.yaml new file mode 100644 index 0000000..56fd3c5 --- /dev/null +++ b/config.dev.yaml @@ -0,0 +1,9 @@ +firehose: + host: "relay1.eurosky.network" + ownerDid: "at://did:plc:ryyjyoqbea5zmanqtutkbc4o" + feedDid: "did:web:blueskyfeeds.dhawos.dev" +elasticsearch: + host: "localhost" + port: "9200" + username: "elastic" + password: "password" diff --git a/config.yaml b/config.yaml index e69de29..56fd3c5 100644 --- a/config.yaml +++ b/config.yaml @@ -0,0 +1,9 @@ +firehose: + host: "relay1.eurosky.network" + ownerDid: "at://did:plc:ryyjyoqbea5zmanqtutkbc4o" + feedDid: "did:web:blueskyfeeds.dhawos.dev" +elasticsearch: + host: "localhost" + port: "9200" + username: "elastic" + password: "password" diff --git a/flake.nix b/flake.nix index d1f2705..7e6d2c4 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,27 @@ src = ./.; vendorHash = "sha256-QRgHkiVwpIA5WUJrupDod1Pidd0vY5ojO0WA6s57KFo="; }; + docker = pkgs.dockerTools.buildImage { + name = "bskyfeedctl"; + tag = "latest"; + fromImage = pkgs.dockerTools.pullImage { + imageName = "ubuntu"; + imageDigest = "sha256:6fee4abc5fe6a21f40022199b2d5063eb591743c80d3d2f5fadf620a98cbae0d"; + finalImageName = "ubuntu"; + finalImageTag = "26.04"; + sha256 = "sha256-Enhe0W8KhCtawv6GovXKtt9yZMA9Xnm8fLgSQk9FBB4="; + os = "linux"; + arch = "x86_64"; + }; + copyToRoot = [ + self.packages.${system}.default + pkgs.dockerTools.caCertificates + ]; + config = { + Entrypoint = [ "${self.packages.${system}.default}/bin/bskyfeedctl" ]; + Cmd = [ "--help" ]; + }; + }; }; }) systems );