diff options
| author | Xe Iaso <me@xeiaso.net> | 2023-03-05 20:07:36 -0500 |
|---|---|---|
| committer | Xe Iaso <me@xeiaso.net> | 2023-03-05 20:07:36 -0500 |
| commit | dcbadadc86eef30bf6673d8446ebdb8fe7b45177 (patch) | |
| tree | ff6f1275ec99ab3b3b943425d4dcc4451cb1b336 | |
| parent | 4b29ee13628ba92878c6ba75e5b17acd3a96bcd6 (diff) | |
| download | x-dcbadadc86eef30bf6673d8446ebdb8fe7b45177.tar.xz x-dcbadadc86eef30bf6673d8446ebdb8fe7b45177.zip | |
bump flake
Signed-off-by: Xe Iaso <me@xeiaso.net>
| -rw-r--r-- | Dockerfile | 14 | ||||
| -rw-r--r-- | docker.go | 49 | ||||
| -rw-r--r-- | flake.lock | 18 |
3 files changed, 9 insertions, 72 deletions
diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 09346a9..0000000 --- a/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM golang:alpine AS build -WORKDIR /x -ENV GOPROXY=https://cache.greedo.xeserv.us -ENV CGO_ENABLED=0 -COPY go.mod . -COPY go.sum . -RUN go mod download -COPY . . -RUN go test ./... -RUN GOBIN=/x/bin go install -v ./... - -FROM alpine -COPY --from=build /x/bin/ /usr/local/bin/ -RUN apk --no-cache add man diff --git a/docker.go b/docker.go deleted file mode 100644 index 1157e39..0000000 --- a/docker.go +++ /dev/null @@ -1,49 +0,0 @@ -//+build ignore - -// Makes the docker image xena/xperimental. -package main - -import ( - "context" - "flag" - "log" - "path/filepath" - - "within.website/x/internal" - "within.website/x/internal/yeet" -) - -var ( - dontPush = flag.Bool("dont-push", false, "if set, don't push docker images") -) - -func main() { - internal.HandleStartup() - ctx, cancel := context.WithCancel(context.Background()) - defer cancel() - - tag := "xena/xperimental" - yeet.DockerBuild(ctx, yeet.WD, tag) - - resTag := yeet.DockerTag(ctx, "xena", "xperimental", tag) - otherResTag := yeet.DockerTag(ctx, "docker.pkg.github.com/xe/x", "xperimental", tag) - - gitTag, err := yeet.GitTag(ctx) - if err != nil { - log.Fatal(err) - } - - dnsdTag := "xena/dnsd:" + gitTag - - yeet.DockerBuild(ctx, filepath.Join(yeet.WD, "cmd", "dnsd"), dnsdTag, "--build-arg", "X_VERSION="+gitTag) - dnsdGithubTag := yeet.DockerTag(ctx, "docker.pkg.github.com/xe/x", "dnsd", dnsdTag) - - if !*dontPush { - yeet.ShouldWork(ctx, nil, yeet.WD, "docker", "push", resTag) - yeet.ShouldWork(ctx, nil, yeet.WD, "docker", "push", otherResTag) - yeet.ShouldWork(ctx, nil, yeet.WD, "docker", "push", dnsdGithubTag) - } - - log.Printf("xperimental:\t%s", otherResTag) - log.Printf("dnsd:\t%s", dnsdGithubTag) -} @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1662501203, - "narHash": "sha256-4BKeqCX2zwgBiTdlc2DjGQ0CttKm0vSw0r/bdFdM/PQ=", + "lastModified": 1677459247, + "narHash": "sha256-JbakfAiPYmCCV224yAMq/XO0udN5coWv/oazblMKdoY=", "owner": "nix-community", "repo": "gomod2nix", - "rev": "89cd0675b96775aa3ee86e7c0cf5bc238dd27976", + "rev": "3cbf3a51fe32e2f57af4c52744e7228bab22983d", "type": "github" }, "original": { @@ -45,11 +45,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1676569297, - "narHash": "sha256-2n4C4H3/U+3YbDrQB6xIw7AaLdFISCCFwOkcETAigqU=", + "lastModified": 1677932085, + "narHash": "sha256-+AB4dYllWig8iO6vAiGGYl0NEgmMgGHpy9gzWJ3322g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac1f5b72a9e95873d1de0233fddcb56f99884b37", + "rev": "3c5319ad3aa51551182ac82ea17ab1c6b0f0df89", "type": "github" }, "original": { @@ -77,11 +77,11 @@ ] }, "locked": { - "lastModified": 1676687290, - "narHash": "sha256-DP0CJ7qtUXf+mmMglJL1yANizzV1O4UfQ9NrKgy7O04=", + "lastModified": 1677983714, + "narHash": "sha256-2A5uDpF0vN4w9tvo5N+918bK0yRYfg4FdNZ/qccgH6s=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "bdccd5e973d45159f7d13f7c65a4271dc02cf6d4", + "rev": "1a9f6285d441ff438a6a1422dc3fde109d8615bf", "type": "github" }, "original": { |