From 3b8a81287b80dcc0fe71717ccbec057a7905ed69 Mon Sep 17 00:00:00 2001 From: Dan Anglin Date: Fri, 17 Nov 2023 21:14:58 +0000 Subject: [PATCH] chore: update project - Updated go.mod file as part of project's migration to Code Flow. - Upgraded Go to v1.21.4. - Moved Go files to src folder. - Moved Dockerfile and Kubernetes manifest files to deploy folder. - Updated README.md. --- .dockerignore | 2 +- README.md | 4 ++-- Dockerfile => deploy/Dockerfile | 6 +++--- {kubernetes => deploy}/manifest.yaml | 0 go.mod | 4 ++-- handlers.go => src/handlers.go | 0 main.go => src/main.go | 0 types.go => src/types.go | 0 8 files changed, 8 insertions(+), 8 deletions(-) rename Dockerfile => deploy/Dockerfile (73%) rename {kubernetes => deploy}/manifest.yaml (100%) rename handlers.go => src/handlers.go (100%) rename main.go => src/main.go (100%) rename types.go => src/types.go (100%) diff --git a/.dockerignore b/.dockerignore index 69804bc..65d926a 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,4 @@ * -!*.go +!src/*.go !go.sum !go.mod diff --git a/README.md b/README.md index e2593f4..875e467 100644 --- a/README.md +++ b/README.md @@ -66,9 +66,9 @@ docker run --rm \ Alternatively you can build and run the docker image locally. ```bash -git clone https://gitlab.com/dananglin/stock-ticker.git +git clone https://codeflow.dananglin.me.uk/apollo/stock-ticker.git cd stock-ticker -docker build -t stock-ticker . +docker build -t stock-ticker -f deploy/Dockerfile . docker run --rm \ -d \ -e SYMBOL=MSFT \ diff --git a/Dockerfile b/deploy/Dockerfile similarity index 73% rename from Dockerfile rename to deploy/Dockerfile index 2043b79..3768674 100644 --- a/Dockerfile +++ b/deploy/Dockerfile @@ -1,17 +1,17 @@ -FROM golang:1.19.6-alpine AS builder +FROM golang:1.21.4-alpine AS builder ENV CGO_ENABLED=0 ENV GOOS=linux ENV GOARCH=amd64 -ADD *.go /workspace/ +ADD src/*.go /workspace/ ADD go.mod /workspace/ WORKDIR /workspace RUN go build -a -v -ldflags="-s -w" -o /workspace/stock-ticker . -FROM gcr.io/distroless/static-debian11 +FROM gcr.io/distroless/static-debian12 COPY --from=builder /workspace/stock-ticker /stock-ticker diff --git a/kubernetes/manifest.yaml b/deploy/manifest.yaml similarity index 100% rename from kubernetes/manifest.yaml rename to deploy/manifest.yaml diff --git a/go.mod b/go.mod index 2dcfd3a..12f4cb8 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ -module gitlab.com/dananglin/stock-ticker +module codeflow.dananglin.me.uk/apollo/stock-ticker -go 1.19 +go 1.21 diff --git a/handlers.go b/src/handlers.go similarity index 100% rename from handlers.go rename to src/handlers.go diff --git a/main.go b/src/main.go similarity index 100% rename from main.go rename to src/main.go diff --git a/types.go b/src/types.go similarity index 100% rename from types.go rename to src/types.go