From 6de88c2364d2458c956d06aa979e1c0f5f4127a3 Mon Sep 17 00:00:00 2001 From: Jens7373 Date: Thu, 14 Aug 2025 08:09:52 +0000 Subject: [PATCH 1/7] Fixed frontend test --- frontend/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/main.go b/frontend/main.go index bede472b4..27f4da2a4 100644 --- a/frontend/main.go +++ b/frontend/main.go @@ -101,5 +101,5 @@ func main() { http.Handle("/", http.FileServer(http.Dir("./static"))) err := http.ListenAndServe(":8080", nil) - fmt.Println("%v", err) + fmt.Printf("%v", err) } From 78c48cc3a8a9d05c980283275993ad642494db58 Mon Sep 17 00:00:00 2001 From: Jeppe Holm Andersen <144018621+JeppeHA@users.noreply.github.com> Date: Thu, 14 Aug 2025 10:21:19 +0200 Subject: [PATCH 2/7] Github actions setup 0.1v --- .github/workflows/main.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 000000000..a35cbd5d4 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,9 @@ +name: simple-fortune-cookie +on: + push +jobs: + Build: + runs-on: go + steps: + - name: Test frontend + run: frontend/main_test.go From f907dfb7656dc99257940aec0ff980cc70fde655 Mon Sep 17 00:00:00 2001 From: Jeppe Holm Andersen <144018621+JeppeHA@users.noreply.github.com> Date: Thu, 14 Aug 2025 10:23:45 +0200 Subject: [PATCH 3/7] Github actions setup 0.2v --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a35cbd5d4..ac572cec7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,8 +2,8 @@ name: simple-fortune-cookie on: push jobs: - Build: - runs-on: go + Test: + runs-on: ubuntu-latest steps: - name: Test frontend - run: frontend/main_test.go + run: simple-fortune-cookie/frontend/main_test.go From 33e6bf33ef5e594b153a669c45b03467dd226a61 Mon Sep 17 00:00:00 2001 From: Jeppe Holm Andersen <144018621+JeppeHA@users.noreply.github.com> Date: Thu, 14 Aug 2025 10:27:30 +0200 Subject: [PATCH 4/7] Github actions setup 0.3v --- .github/workflows/main.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ac572cec7..ec28d569a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,5 +5,9 @@ jobs: Test: runs-on: ubuntu-latest steps: - - name: Test frontend - run: simple-fortune-cookie/frontend/main_test.go + - name: Checkout repo + uses: actions/checkout@v4 + + - name: Test frontend + run: go test ./frontend/ + From 5f853206cb77b72deaf659b991df7fe76fd44c59 Mon Sep 17 00:00:00 2001 From: Jeppe Holm Andersen <144018621+JeppeHA@users.noreply.github.com> Date: Thu, 14 Aug 2025 10:35:15 +0200 Subject: [PATCH 5/7] Github actions setup 0.4v --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ec28d569a..8a058f781 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,6 +8,7 @@ jobs: - name: Checkout repo uses: actions/checkout@v4 - - name: Test frontend - run: go test ./frontend/ + - name: Test Frontend + working-directory: frontend + run: go test ./... From 6ab246704baebb39d3ab4eb39ffd8615c1bcb1b1 Mon Sep 17 00:00:00 2001 From: Jens7373 Date: Thu, 14 Aug 2025 10:44:31 +0000 Subject: [PATCH 6/7] Added new Dockerfiles to front and backend --- backend/Dockerfile | 6 ++++++ frontend/Dockerfile | 6 ++++++ 2 files changed, 12 insertions(+) create mode 100644 backend/Dockerfile create mode 100644 frontend/Dockerfile diff --git a/backend/Dockerfile b/backend/Dockerfile new file mode 100644 index 000000000..0b7be642b --- /dev/null +++ b/backend/Dockerfile @@ -0,0 +1,6 @@ +FROM golang:1.21-alpine AS builder +WORKDIR /app +COPY . /app +RUN go mod download && go mod verify +RUN cd /app && go build -o goapp +ENTRYPOINT ["./goapp"] \ No newline at end of file diff --git a/frontend/Dockerfile b/frontend/Dockerfile new file mode 100644 index 000000000..0b7be642b --- /dev/null +++ b/frontend/Dockerfile @@ -0,0 +1,6 @@ +FROM golang:1.21-alpine AS builder +WORKDIR /app +COPY . /app +RUN go mod download && go mod verify +RUN cd /app && go build -o goapp +ENTRYPOINT ["./goapp"] \ No newline at end of file From 2d777217890939ef57bdccf5ff91af1e25fda652 Mon Sep 17 00:00:00 2001 From: Jeppe Date: Thu, 14 Aug 2025 11:54:24 +0000 Subject: [PATCH 7/7] Added composefile --- docker-compose.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 docker-compose.yaml diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 000000000..f89c51d63 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,17 @@ +services: + frontend-container: + image: frontenddocker + ports: + - 8080:8080 + depends_on: + - backend-container + environment: + BACKEND_PORT: 9000 + BACKEND_DNS: backend-container + + + backend-container: + image: backenddocker + ports: + - 9000:9000 +