From e820812278799c9b75b3025a81e7a64dc65259b7 Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@lanl.gov>
Date: Sat, 12 Sep 2020 03:24:24 +0000
Subject: [PATCH] Fix docker build?

---
 .github/workflows/docker_build_devel.yml | 12 ------------
 .github/workflows/docker_build_mothd.yml |  2 +-
 Dockerfile                               | 15 +++++++++++++++
 Dockerfile.moth                          | 12 ------------
 4 files changed, 16 insertions(+), 25 deletions(-)
 delete mode 100644 .github/workflows/docker_build_devel.yml
 create mode 100644 Dockerfile
 delete mode 100644 Dockerfile.moth

diff --git a/.github/workflows/docker_build_devel.yml b/.github/workflows/docker_build_devel.yml
deleted file mode 100644
index e726c91..0000000
--- a/.github/workflows/docker_build_devel.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: moth-devel Docker build
-on: [push]
-
-jobs:
-  build-devel:
-    name: Build moth-devel
-    runs-on: ubuntu-latest
-    steps:
-      - name: Retrieve code
-        uses: actions/checkout@v1
-      - name: Build mothd
-        run: docker build -f Dockerfile.moth-devel .
diff --git a/.github/workflows/docker_build_mothd.yml b/.github/workflows/docker_build_mothd.yml
index 1aff1ea..63b8aaa 100644
--- a/.github/workflows/docker_build_mothd.yml
+++ b/.github/workflows/docker_build_mothd.yml
@@ -9,4 +9,4 @@ jobs:
       - name: Retrieve code
         uses: actions/checkout@v1
       - name: Build mothd
-        run: docker build -f Dockerfile.moth .
+        run: docker build .
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..1205490
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,15 @@
+FROM golang:1.13 AS builder
+COPY go.* /src/
+COPY pkg /src/pkg/
+COPY cmd /src/cmd/
+WORKDIR /src/
+#RUN go test ./...
+RUN CGO_ENABLED=0 GOOS=linux go install -i -a -ldflags '-extldflags "-static"' ./...
+
+FROM scratch
+COPY --from=builder /go/bin/* /usr/bin/
+COPY theme /theme/
+COPY example-puzzles /puzzles/
+COPY LICENSE.md /LICENSE.md
+
+ENTRYPOINT [ "/usr/bin/mothd" ]
diff --git a/Dockerfile.moth b/Dockerfile.moth
deleted file mode 100644
index 86768d9..0000000
--- a/Dockerfile.moth
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM golang:1.12.0-alpine AS builder
-COPY src /go/src/github.com/dirtbags/moth/src
-WORKDIR /go/src/github.com/dirtbags/moth/src
-RUN go get .
-RUN CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-extldflags "-static"' -o /mothd *.go
-
-FROM scratch
-COPY --from=builder /mothd /mothd
-COPY theme /theme
-COPY LICENSE.md /LICENSE
-
-ENTRYPOINT [ "/mothd" ]