From 73dce3d1f37706cf61ebba776670762ab5b5d8bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torjus=20H=C3=A5kestad?= <torjus@usit.uio.no>
Date: Wed, 19 Mar 2025 22:28:28 +0100
Subject: [PATCH] Update Dockerfile

---
 Dockerfile | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e100c01..56d5e74 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,16 @@
-FROM node:latest as frontend-builder
-RUN mkdir -p /app/frontend
-COPY web/frontend/yarn.lock /app/frontend/yarn.lock
-COPY web/frontend/package.json /app/frontend/package.json
-WORKDIR /app/frontend
-RUN yarn install
-COPY web/frontend /app/frontend
-WORKDIR /app/frontend
-RUN GENERATE_SOURCEMAP=false yarn build
+FROM node:alpine as frontend-builder
+WORKDIR /app
+COPY frontend/package.json /app
+COPY frontend/package-lock.json /app
+RUN npm install
+COPY frontend .
+RUN npm run build
+
+FROM alpine:latest as geoip-fetcher
+RUN apk add --no-cache git
+WORKDIR /app
+RUN git clone https://github.com/geoacumen/geoacumen-country.git
+RUN find .
 
 FROM golang:latest as builder
 WORKDIR /app
@@ -14,16 +18,15 @@ COPY go.mod /app/go.mod
 COPY go.sum /app/go.sum
 RUN go mod download
 COPY . /app
-RUN rm -rf /app/server/frontend
-COPY --from=frontend-builder /app/frontend/dist /app/web/frontend/dist
-RUN CGO_ENABLED=0 INSTALL_PREFIX=/app make install
+COPY --from=geoip-fetcher /app/geoacumen-country/Geoacumen-Country.mmdb honeypot/ssh
+COPY --from=frontend-builder /app/dist /app/web/frontend/dist
+RUN CGO_ENABLED=0 go build -tags embed cmd/apiary/apiary.go
 
 FROM alpine:latest
 RUN apk add --no-cache curl
 WORKDIR /app
-COPY --from=builder /app/etc/apiary/apiary.toml /app/apiary.toml
-COPY --from=builder /app/bin/apiary /app/apiary
+COPY --from=builder /app/apiary.toml /app/apiary.toml
+COPY --from=builder /app/apiary /app/apiary
 EXPOSE 8080
 EXPOSE 2222
-HEALTHCHECK --interval=1m --timeout=10s --start-period=5s --retries=3 CMD curl -s -o /dev/null -w "%{http_code}" http://127.0.0.1:8080/api/health || exit 1
 CMD ["/app/apiary", "serve"]